tree e1617b8c3fa243d919912bebeca7a89840532d34
parent 026bf9bbcf88f31ea619eb46cf9d62beade00821
parent 70455e790391dac85d9b483a9e286a40df1ecc7f
author Linus Torvalds <torvalds@linux-foundation.org> 1211144214 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1211144214 -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/max6875: Really prevent 24RF08 corruption
  i2c-amd756: Fix functionality flags
  i2c: Kill the old driver matching scheme
  i2c: Convert remaining new-style drivers to use module aliasing
  i2c: Switch pasemi to the new device/driver matching scheme
  i2c: Clean up Blackfin BF527 I2C device declarations
  i2c-nforce2: Disable the second SMBus channel on the DFI Lanparty NF4 Expert
  i2c: New co-maintainer