Merge branch 'for-linus/i2c/2636-rc8' of git://git.fluff.org/bjdooks/linux
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 18 Oct 2010 20:05:10 +0000 (13:05 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 18 Oct 2010 20:05:10 +0000 (13:05 -0700)
commitf68c834b045afc8c80ec167cccf48934c8970022
treec1f6b0e3e71146cd1abf41ae6f39f207246aec16
parent822a2e452423e71fd9743cedf0b0fa8ac1ee6d12
parente39428d53d080ad2615b772d7f99d2a70c2aaab2
Merge branch 'for-linus/i2c/2636-rc8' of git://git.fluff.org/bjdooks/linux

* 'for-linus/i2c/2636-rc8' of git://git.fluff.org/bjdooks/linux:
  i2c-imx: do not allow interruptions when waiting for I2C to complete
  i2c-davinci: Fix TX setup for more SoCs