| commit | 816dc3c82b34f709dc1c29ea0a6f417d739a3487 | |
| author | Linus Torvalds <torvalds@linux-foundation.org> | |
| Tue, 12 May 2009 18:21:51 +0000 (12 11:21 -0700) | ||
| committer | Linus Torvalds <torvalds@linux-foundation.org> | |
| Tue, 12 May 2009 18:21:51 +0000 (12 11:21 -0700) | ||
| tree | bcb85e4446195215f0ad4511956b0770383d501d | treesnapshot (tar.gz zip) |
| parent | 3b4334e200ba50cd02e53b122ef56214b170ea23 | commitdiff |
| parent | 36521c271e5f93b249329ee7f321d27825970e31 | commitdiff |
Merge branch 'i2c-for-2630-rc5' of git://aeryn.fluff.org.uk/bjdooks/linux
* 'i2c-for-2630-rc5' of git://aeryn.fluff.org.uk/bjdooks/linux:
i2c-cpm: Pass dev ptr to dma_*_coherent rather than NULL
i2c: Enable i2c-s3c2410 for S3C64XX too
i2c-mpc: bug fix for MPC52xx clock setting and printout
i2c-pxa.c: timeouts off by 1
* 'i2c-for-2630-rc5' of git://aeryn.fluff.org.uk/bjdooks/linux:
i2c-cpm: Pass dev ptr to dma_*_coherent rather than NULL
i2c: Enable i2c-s3c2410 for S3C64XX too
i2c-mpc: bug fix for MPC52xx clock setting and printout
i2c-pxa.c: timeouts off by 1