| commit | 5004de1809a5ad97a76840da9f62a1111da505e7 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Tue Mar 25 09:06:44 2008 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Tue Mar 25 09:06:44 2008 -0700 |
| tree | 8550cd78e5cc0086922cc307c6a173de923ba957 | |
| parent | e584152571d1535a3d27138b91e0ece3b713dd6b [diff] | |
| parent | 8c07e46f39d8c613cf2281c7d87908c0105fb0d0 [diff] |
Merge branch 'i2c-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6 * 'i2c-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6: i2c: Fix docbook problem ASoC/TLV320AIC3X: Stop I2C driver ID abuse i2c-omap: Fix unhandled fault i2c-bfin-twi: Disable BF54x support for now