From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 12 Mar 2008 20:07:12 +0000 (-0700)
Subject: Merge branch 'i2c-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6
X-Git-Tag: v2.6.25-rc6~32
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=123d43acd2e55cd7db792d17c7e906db42cada42;p=~shefty%2Frdma-dev.git

Merge branch 'i2c-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6

* 'i2c-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6:
  i2c: chips subdirectory is deprecated
  i2c: Keep client->driver and client->dev.driver in sync
  i2c-amd756: Fix off-by-one
---

123d43acd2e55cd7db792d17c7e906db42cada42