Merge branch 'for-linus/i2c/2636-rc5' of git://git.fluff.org/bjdooks/linux
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 22 Sep 2010 01:21:05 +0000 (18:21 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 22 Sep 2010 01:21:05 +0000 (18:21 -0700)
* 'for-linus/i2c/2636-rc5' of git://git.fluff.org/bjdooks/linux:
  i2c-omap: Make sure i2c bus is free before setting it to idle


Trivial merge