| commit | 62f1b494d82272819570d715eb6633887a9fde20 | |
| author | Linus Torvalds <torvalds@linux-foundation.org> | |
| Wed, 22 Sep 2010 01:21:05 +0000 (21 18:21 -0700) | ||
| committer | Linus Torvalds <torvalds@linux-foundation.org> | |
| Wed, 22 Sep 2010 01:21:05 +0000 (21 18:21 -0700) | ||
| tree | 014e6aa79a4c7211dce4b22c781cf23fdd2cc00c | treesnapshot (tar.gz zip) |
| parent | 8b15575cae7a93a784c3005c42b069edd9ba64dd | commitdiff |
| parent | 5c64eb26ed5c5550fbabd345e573af3fc6a7f775 | commitdiff |
Merge branch 'for-linus/i2c/2636-rc5' of git://git.fluff.org/bjdooks/linux
* 'for-linus/i2c/2636-rc5' of git://git.fluff.org/bjdooks/linux:
i2c-omap: Make sure i2c bus is free before setting it to idle
* 'for-linus/i2c/2636-rc5' of git://git.fluff.org/bjdooks/linux:
i2c-omap: Make sure i2c bus is free before setting it to idle