aboutsummaryrefslogtreecommitdiffstats
path: root/kernel
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2008-12-17 18:05:26 -0500
committerLinus Torvalds <torvalds@linux-foundation.org>2008-12-17 18:05:26 -0500
commit55dac3a5553b13891f0ae4bbd11920619b5436d4 (patch)
tree88431185f839d44a92dae9a58adba30d9be65aea /kernel
parent0bc77ecbe4f69ff8ead1d2abfe84ca9ba2a7bca4 (diff)
parentbe44f01e8af3862767f466f89c12640a2f2b0038 (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
Diffstat (limited to 'kernel')
0 files changed, 0 insertions, 0 deletions