From: Linus Torvalds Date: Sun, 18 Dec 2011 22:14:46 +0000 (-0800) Subject: Merge branch 'for-linus/i2c-32-rc6' of git://git.fluff.org/bjdooks/linux X-Git-Tag: v3.2-rc7~43 X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=e34d6b4b1ca5b4ec6811544c495fadd86e2cccbd;p=linux.git Merge branch 'for-linus/i2c-32-rc6' of git://git.fluff.org/bjdooks/linux * 'for-linus/i2c-32-rc6' of git://git.fluff.org/bjdooks/linux: i2c-eg20t: correct the driver init order of pch_i2c_probe() I2C: OMAP: fix FIFO usage for OMAP4 i2c-s3c2410: Fix return code of s3c24xx_i2c_parse_dt_gpio i2c: i2c-s3c2410: Add a cpu_relax() to busy wait for bus idle --- e34d6b4b1ca5b4ec6811544c495fadd86e2cccbd