]> 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: 7f5fe3e 33dc0ad)
Merge branch 'for-linus' of git://www.jni.nu/cris
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 28 Mar 2011 22:44:06 +0000 (15:44 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 28 Mar 2011 22:44:06 +0000 (15:44 -0700)
* 'for-linus' of git://www.jni.nu/cris:
  Correct auto-restart of syscalls via restartblock
  CRISv10: Fix return before mutex_unlock in pcf8563
  Drop the CRISv32 version of pcf8563

1  2 
arch/cris/Kconfig patch | diff1 | diff2 | blob | history

diff --cc arch/cris/Kconfig
Simple merge
Linux kernel for KaRo TX COM modules