| commit | b7b6cf005b59ff5a4dba10338954c3dcfc75ef7b | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Thu Apr 22 07:20:30 2010 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Thu Apr 22 07:20:30 2010 -0700 |
| tree | 1ee58483cb0f54acfc76a9800412f1cce77c0c57 | |
| parent | 74a920139a0f1119c5a604cef0ce5d6f591dc782 [diff] | |
| parent | 42df64b1f83fa9b786067a0b5a3aca0fbb2d8db8 [diff] |
Merge branch 'for-linus/i2c' of git://git.fluff.org/bjdooks/linux * 'for-linus/i2c' of git://git.fluff.org/bjdooks/linux: i2c-stu300: off by one issue i2c-pnx: Add stop conditions for end of transfer i2c-pnx: Limit maximum divider to 1023 i2c-omap: fix OOPS in omap_i2c_unidle() during probe i2c-imx: fix error handling