tree a46e864f9c508d8228e79928519742af6a42b7e4
parent c3921ab71507b108d51a0f1ee960f80cd668a93d
parent ae429083efe996ca2c569c44fd6fea440676dc33
author Linus Torvalds <torvalds@linux-foundation.org> 1210550964 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1210550964 -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: Convert some more new-style drivers to use module aliasing
  i2c: Match dummy devices by type
  i2c-sibyte: Mark i2c_sibyte_add_bus() as static
  i2c-sibyte: Correct a comment about frequency
  i2c: Improve the functionality documentation
  i2c: Improve smbus-protocol documentation
  i2c-piix4: Blacklist two mainboards
  i2c-piix4: Increase the intitial delay for the ServerWorks CSB5
  i2c-mpc: Compare to NO_IRQ instead of zero