tree 9ab836fd4290caca99223b9391885625e934e587
parent 7f5fe3ec8eab23cc28e8fb7d23b4777ad6a05734
parent 33dc0ad78a961dfbbb2fb65fd9df3b66ba119f57
author Linus Torvalds <torvalds@linux-foundation.org> 1301352246 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1301352246 -0700

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