| commit | f328ddc154605be11c4ca38fee6ace8adb140087 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Tue May 05 08:27:14 2009 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Tue May 05 08:27:14 2009 -0700 |
| tree | 53589963a1b6af22d0a26db7ab1e03dfeedb2b89 | |
| parent | 80445de57764b45fc26315c19fe7dc9fc57c2c65 [diff] | |
| parent | 2196d1cf4afab93fb64c2e5b417096e49b661612 [diff] |
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