| commit | aa303f2c06c0f3b42190b7e56c16bc856b1a1b28 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Wed Jan 18 13:46:13 2012 -0800 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Wed Jan 18 13:46:13 2012 -0800 |
| tree | a916c85bbdd3a23e27c1f71aa90afe8a179d99bb | |
| parent | 4a7c1ff2362b7bfbc04990f42c21cefdff57f997 [diff] | |
| parent | 6f36a806e588f2ce62571a1859ea1d7f2c7dde83 [diff] |
Merge branch 'for-linus/i2c-33' of git://git.fluff.org/bjdooks/linux * 'for-linus/i2c-33' of git://git.fluff.org/bjdooks/linux: i2c-eg20t: Change-company-name-OKI-SEMICONDUCTOR to LAPIS Semiconductor i2c-eg20t: Support new device LAPIS Semiconductor ML7831 IOH i2c-eg20t: modified the setting of transfer rate. i2c-eg20t: use i2c_add_numbered_adapter to get a fixed bus number i2c: OMAP: Add DT support for i2c controller I2C: OMAP: NACK without STP I2C: OMAP: correct SYSC register offset for OMAP4