| commit | 37d8cb5478651b27779b9a80d024c614c452eae3 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Tue May 24 15:20:02 2011 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Tue May 24 15:20:02 2011 -0700 |
| tree | 53fe55f595dea61ba8acd72bd19d2655513b7195 | |
| parent | dc522adbee91dd17fa31f8e8cf72673fe0e8370e [diff] | |
| parent | 07da0372dd6ca5517400ce95040861def25930c8 [diff] |
Merge branch 'i2c-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging * 'i2c-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging: i2c-parport: Various cleanups i2c-i801: Don't depend on other kernel driver config options i2c-i801: Check for vendor Fujitsu before probing for apanel i2c-i801: Don't probe for slaves on IDF channels i2c-i801: SMBus patch for Intel Panther Point DeviceIDs i2c/writing-clients: Fix foo_driver.id_table