]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
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)
* 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.


Trivial merge