| commit | e34d6b4b1ca5b4ec6811544c495fadd86e2cccbd | |
| author | Linus Torvalds <torvalds@linux-foundation.org> | |
| Sun, 18 Dec 2011 22:14:46 +0000 (18 14:14 -0800) | ||
| committer | Linus Torvalds <torvalds@linux-foundation.org> | |
| Sun, 18 Dec 2011 22:14:46 +0000 (18 14:14 -0800) | ||
| tree | a242c5993090fc995d3695958bcd5284ec484962 | treesnapshot (tar.gz zip) |
| parent | 497f16f21a04060098c0da6ed522fbcafb90c0db | commitdiff |
| parent | 0d5fb5ea7d0e6bc84a523c39a666d7eb1a7e43de | commitdiff |
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
* '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