Merge branch 'i2c-fixes-rc6' of git://aeryn.fluff.org.uk/bjdooks/linux
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 20 Aug 2009 21:55:24 +0000 (14:55 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 20 Aug 2009 21:55:24 +0000 (14:55 -0700)
commit429966b8f644dda2afddb4f834a944e9b46a7645
treeeb1a05f73fcb0745d5cdcc228a5c9db19fdfa187
parenta1d12511157c8d22a5a6779f8a9d73a1adcfc3b0
parentc37faafa7d46622b749437f7d294201a63af4beb
Merge branch 'i2c-fixes-rc6' of git://aeryn.fluff.org.uk/bjdooks/linux

* 'i2c-fixes-rc6' of git://aeryn.fluff.org.uk/bjdooks/linux:
  i2c-stu300: I2C STU300 stability updates
  i2c-omap: Enable workaround for Errata 1.153 based on
  i2c-omap: ACK pending [R/X]DR and [R/X]RDY interrupts
  i2c-omap: Fix I2C status ACK