Merge branch 'i2c-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 12 Mar 2008 20:07:12 +0000 (13:07 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 12 Mar 2008 20:07:12 +0000 (13:07 -0700)
commit123d43acd2e55cd7db792d17c7e906db42cada42
tree704c222d21fcc9954742f3e3b05ec8e22fe35c01
parent299601cfc0aabbabf82fca50652b7290cce7eb00
parent3d706d952cf238a60c5571e33329448b453a2ab9
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