| commit | 55dac3a5553b13891f0ae4bbd11920619b5436d4 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Wed Dec 17 15:05:26 2008 -0800 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Wed Dec 17 15:05:26 2008 -0800 |
| tree | 88431185f839d44a92dae9a58adba30d9be65aea | |
| parent | 0bc77ecbe4f69ff8ead1d2abfe84ca9ba2a7bca4 [diff] | |
| parent | be44f01e8af3862767f466f89c12640a2f2b0038 [diff] |
Merge branch 'i2c-fixes' of git://aeryn.fluff.org.uk/bjdooks/linux * 'i2c-fixes' of git://aeryn.fluff.org.uk/bjdooks/linux: i2c-s3c2410: fix check for being in suspend. i2c-cpm: Detect and report NAK right away instead of timing out