From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 16 Jun 2009 18:29:17 +0000 (-0700)
Subject: Merge branch 'i2c-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvar... 
X-Git-Tag: v2.6.31-rc1~317
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=4858704da75ba84ce21e6d4b3b974e8b8594c9f2;p=karo-tx-linux.git

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
---

4858704da75ba84ce21e6d4b3b974e8b8594c9f2