summaryrefslogtreecommitdiff
path: root/kernel
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-03-29 02:44:06 +0400
committerLinus Torvalds <torvalds@linux-foundation.org>2011-03-29 02:44:06 +0400
commit5847098cd896c92819800e17e983bf6530035209 (patch)
tree9ab836fd4290caca99223b9391885625e934e587 /kernel
parent7f5fe3ec8eab23cc28e8fb7d23b4777ad6a05734 (diff)
parent33dc0ad78a961dfbbb2fb65fd9df3b66ba119f57 (diff)
downloadlinux-5847098cd896c92819800e17e983bf6530035209.tar.xz
Merge branch 'for-linus' of git://www.jni.nu/cris
* '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
Diffstat (limited to 'kernel')
0 files changed, 0 insertions, 0 deletions