| commit | f68c834b045afc8c80ec167cccf48934c8970022 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Mon Oct 18 13:05:10 2010 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Mon Oct 18 13:05:10 2010 -0700 |
| tree | c1f6b0e3e71146cd1abf41ae6f39f207246aec16 | |
| parent | 822a2e452423e71fd9743cedf0b0fa8ac1ee6d12 [diff] | |
| parent | e39428d53d080ad2615b772d7f99d2a70c2aaab2 [diff] |
Merge branch 'for-linus/i2c/2636-rc8' of git://git.fluff.org/bjdooks/linux * 'for-linus/i2c/2636-rc8' of git://git.fluff.org/bjdooks/linux: i2c-imx: do not allow interruptions when waiting for I2C to complete i2c-davinci: Fix TX setup for more SoCs