From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 20 Aug 2009 21:55:24 +0000 (-0700)
Subject: Merge branch 'i2c-fixes-rc6' of git://aeryn.fluff.org.uk/bjdooks/linux
X-Git-Url: http://git.mmlx.us/?a=commitdiff_plain;h=429966b8f644dda2afddb4f834a944e9b46a7645;p=linux-edison.git

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
---

429966b8f644dda2afddb4f834a944e9b46a7645