From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 5 May 2009 15:27:14 +0000 (-0700)
Subject: Merge branch 'i2c-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6
X-Git-Url: http://git.mmlx.us/?a=commitdiff_plain;h=f328ddc154605be11c4ca38fee6ace8adb140087;p=linux-edison.git

Merge branch 'i2c-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6

* 'i2c-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6:
  i2c-algo-pca: Let PCA9564 recover from unacked data byte (state 0x30)
  i2c-algo-bit: Fix timeout test
  i2c: Timeouts off by 1
---

f328ddc154605be11c4ca38fee6ace8adb140087