tree 153f92e4ac0d5c90890ee1b14458ea56e22f984e
parent 86ade88e15b0852fa437e816037ecb266ae990ad
parent 036533e232922ec6667817de9b037d0b1ebd062e
author Linus Torvalds <torvalds@linux-foundation.org> 1245176957 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1245176957 -0700

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:
  therm_windtunnel: Convert to a new-style i2c driver
  therm_adt746x: Convert to a new-style i2c driver
  windfarm: Convert to new-style i2c drivers
  therm_pm72: Convert to a new-style i2c driver
  i2c-viapro: Add new PCI device ID for VX855
  i2c/chips: Move max6875 to drivers/misc/eeprom
  i2c: Do not give adapters a default parent
  i2c: Do not probe for TV chips on Voodoo3 adapters
  i2c: Retry automatically on arbitration loss
  i2c: Remove void casts