| commit | 50440c6dcccbf90ee3629407cb13ca09cab7d900 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Sun Oct 31 21:03:23 2010 -0400 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Sun Oct 31 21:03:23 2010 -0400 |
| tree | 6441432e78ec884863e5104ad4893e2a3dbe8059 | |
| parent | 09d692e6ff50e455f936e7e114e11f6ec5e0ea33 [diff] | |
| parent | 55fee8d7f7cb011d7f161cf816220ac74e34b6b1 [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-i801: Add PCI idents for Patsburg 'IDF' SMBus controllers i2c-i801: Handle multiple instances instead of keeping global state i2c-i801: Add Intel Patsburg device ID i2c: Drop unused I2C_CLASS_TV flags