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)
* '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


Trivial merge