From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 25 Mar 2008 16:06:44 +0000 (-0700)
Subject: Merge branch 'i2c-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6
X-Git-Tag: v2.6.25-rc7~2
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=5004de1809a5ad97a76840da9f62a1111da505e7;p=~emulex%2Finfiniband.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: Fix docbook problem
  ASoC/TLV320AIC3X: Stop I2C driver ID abuse
  i2c-omap: Fix unhandled fault
  i2c-bfin-twi: Disable BF54x support for now
---

5004de1809a5ad97a76840da9f62a1111da505e7