From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 24 May 2011 22:20:02 +0000 (-0700)
Subject: Merge branch 'i2c-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvar... 
X-Git-Tag: v3.0-rc1~306
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=37d8cb5478651b27779b9a80d024c614c452eae3;p=~emulex%2Finfiniband.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:
  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
---

37d8cb5478651b27779b9a80d024c614c452eae3