Merge master.kernel.org:/pub/scm/linux/kernel/git/lethal/sh-2.6
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Tue, 19 Jun 2007 15:07:34 +0000 (08:07 -0700)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Tue, 19 Jun 2007 15:07:34 +0000 (08:07 -0700)
commit3197dac24f4f98808a47c68cdb8efeee8539add1
tree6855c488c677d6be01e457161c3434628d0b2f10
parent710675d3609b1123a40db1eb28bf34041b1d37f2
parent3aeb884b4ec442719a2d8aa15316415a7412efd8
Merge /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.