tree 54c70fc60b97c1ea9bd8409b0ef36f8322bbf60e
parent 0ad30b8fd5fe798aae80df6344b415d8309342cc
parent 935298696f469c0e07c73be687bd055878074ce0
author Linus Torvalds <torvalds@linux-foundation.org> 1239636768 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1239636768 -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: Let new-style drivers implement attach_adapter
  i2c: Fix sparse warnings for I2C_BOARD_INFO()
  i2c-voodoo3: Deprecate in favor of tdfxfb
  i2c-algo-pca: Fix use of uninitialized variable in debug message