From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 12 May 2008 00:09:24 +0000 (-0700)
Subject: Merge branch 'i2c-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6
X-Git-Tag: v2.6.26-rc2~1
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=57014123512633ab0c38a4fea4140bf156f6a3a0;p=~shefty%2Frdma-dev.git

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
---

57014123512633ab0c38a4fea4140bf156f6a3a0