From: Linus Torvalds Date: Tue, 14 Aug 2007 16:52:12 +0000 (-0700) Subject: Merge branch 'i2c-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6 X-Git-Tag: v2.6.23-rc4~136 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=3b993e8bee32d6dfe04df560eda8e1aff6248a22;p=linux-2.6-omap-h63xx.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-s3c2410: Build fix i2c/menelaus: Build fix i2c-mv64xxx: Reinitialize hw and driver on I2C bus hang i2c-mpc: Don't disable I2C module on stop condition i2c-iop3xx: Set I2C_CLASS_HWMON to adapter class i2c/isp1301_omap: Build fixes, whitespace i2c-mpc: Pass correct dev_id to free_irq on error path i2c-i801: Typo: erroneous --- 3b993e8bee32d6dfe04df560eda8e1aff6248a22