projects / openwrt / staging / blogic.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 0bc77ec be44f01)
Merge branch 'i2c-fixes' of git://aeryn.fluff.org.uk/bjdooks/linux
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 17 Dec 2008 23:05:26 +0000 (15:05 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 17 Dec 2008 23:05:26 +0000 (15:05 -0800)
* '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


Trivial merge
John Crispins staging tree