]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commit
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)
commit5847098cd896c92819800e17e983bf6530035209
tree9ab836fd4290caca99223b9391885625e934e587
parent7f5fe3ec8eab23cc28e8fb7d23b4777ad6a05734
parent33dc0ad78a961dfbbb2fb65fd9df3b66ba119f57
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
arch/cris/Kconfig