tree 704c222d21fcc9954742f3e3b05ec8e22fe35c01
parent 299601cfc0aabbabf82fca50652b7290cce7eb00
parent 3d706d952cf238a60c5571e33329448b453a2ab9
author Linus Torvalds <torvalds@linux-foundation.org> 1205352432 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1205352432 -0700

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