Merge branch 'i2c-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 5 May 2009 15:27:14 +0000 (08:27 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 5 May 2009 15:27:14 +0000 (08:27 -0700)
* '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


Trivial merge