| commit | b5bdd43876e475724c662f99206f0349c67e33e6 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Mon Jun 22 12:44:14 2009 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Mon Jun 22 12:44:14 2009 -0700 |
| tree | fc20fe0744428c3871076967b0a57c8cc3f023f3 | |
| parent | f39cf0b783b3f402ddf1eb6a09234b5bfe34bb2a [diff] | |
| parent | dc1972d02747d2170fb1d78d114801f5ecb27506 [diff] |
Merge branch 'next-i2c' of git://aeryn.fluff.org.uk/bjdooks/linux * 'next-i2c' of git://aeryn.fluff.org.uk/bjdooks/linux: i2c: Fix stuck transaction on cpm-i2c driver i2c-omap: Fix build breaking typo cpu_is_omap_2430