]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
projects / karo-tx-linux.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a53e77f c8d4763)
Merge branch 'for-31-rc3/i2c-fixes' of git://git.fluff.org/bjdooks/linux
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 24 Aug 2011 22:54:30 +0000 (15:54 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 24 Aug 2011 22:54:30 +0000 (15:54 -0700)
* 'for-31-rc3/i2c-fixes' of git://git.fluff.org/bjdooks/linux:
  i2c-nomadik: fix kerneldoc warning
  Revert "i2c-omap: fix static suspend vs. runtime suspend"
  i2c-nomadik: Do not use _interruptible_ variant call


Trivial merge
Linux kernel for KaRo TX COM modules