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

Simple merge