tree 6441432e78ec884863e5104ad4893e2a3dbe8059
parent 09d692e6ff50e455f936e7e114e11f6ec5e0ea33
parent 55fee8d7f7cb011d7f161cf816220ac74e34b6b1
author Linus Torvalds <torvalds@linux-foundation.org> 1288573403 -0400
committer Linus Torvalds <torvalds@linux-foundation.org> 1288573403 -0400

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