From: Linus Torvalds Date: Tue, 24 May 2011 23:39:23 +0000 (-0700) Subject: Merge branch 'for-linus/2640/i2c' of git://git.fluff.org/bjdooks/linux X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=4a7df24ddc7097cd789a7527187826552ea0765e;p=deliverable%2Flinux.git Merge branch 'for-linus/2640/i2c' of git://git.fluff.org/bjdooks/linux * 'for-linus/2640/i2c' of git://git.fluff.org/bjdooks/linux: (21 commits) mach-ux500: set proper I2C platform data from MOP500s i2c-nomadik: break out single messsage transmission i2c-nomadik: reset the hw after status check i2c-nomadik: remove the unnecessary delay i2c-nomadik: change the TX and RX threshold i2c-nomadik: add code to retry on timeout failure i2c-nomadik: use pm_runtime API i2c-nomadik: print abort cause only on abort tag i2c-nomadik: correct adapter timeout initialization i2c-nomadik: remove the redundant error message i2c-nomadik: corrrect returned error numbers i2c-nomadik: fix speed enumerator i2c-nomadik: make i2c timeout specific per i2c bus i2c-nomadik: add regulator support i2c: i2c-sh_mobile bus speed platform data V2 i2c: i2c-sh_mobile clock string removal i2c-eg20t: Support new device ML7223 IOH i2c: tegra: Add de-bounce cycles. i2c: tegra: fix repeated start handling i2c: tegra: recover from spurious interrupt storm ... --- 4a7df24ddc7097cd789a7527187826552ea0765e