From: Linus Torvalds <torvalds@woody.linux-foundation.org>
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-Tag: v2.6.22-rc6~84
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3197dac24f4f98808a47c68cdb8efeee8539add1;p=linux-2.6

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