From: Linus Torvalds Date: Tue, 19 Jun 2007 15:07:34 +0000 (-0700) Subject: Merge master.kernel.org:/pub/scm/linux/kernel/git/lethal/sh-2.6 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=3197dac24f4f98808a47c68cdb8efeee8539add1;p=linux-beck.git Merge master.kernel.org:/pub/scm/linux/kernel/git/lethal/sh-2.6 * master.kernel.org:/pub/scm/linux/kernel/git/lethal/sh-2.6: sh: Handle -ERESTART_RESTARTBLOCK for restartable syscalls. sh: oops_enter()/oops_exit() in die(). sh: Fix restartable syscall arg5 clobbering. --- 3197dac24f4f98808a47c68cdb8efeee8539add1