From: Linus Torvalds Date: Mon, 28 Mar 2011 22:44:06 +0000 (-0700) Subject: Merge branch 'for-linus' of git://www.jni.nu/cris X-Git-Tag: firefly_0821_release~7613^2~1745 X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=5847098cd896c92819800e17e983bf6530035209;p=firefly-linux-kernel-4.4.55.git 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 --- 5847098cd896c92819800e17e983bf6530035209