Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Sun, 11 May 2008 16:55:48 +0000 (09:55 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sun, 11 May 2008 16:55:48 +0000 (09:55 -0700)
commit854a989546c12683186c84601d4902591dddd8a9
tree143362c88a48958bdf68396379c4401f6caa82ae
parent633331f389c2d9c631371d09a54626a5e4749452
parent28e6103665301ce60634e8a77f0b657c6cc099de
Merge git://git./linux/kernel/git/davem/sparc-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6:
  sparc: Fix debugger syscall restart interactions.
  sparc: Fix ptrace() detach.
  sparc32: Don't twiddle PT_DTRACE in exec.
  sparc video: remove open boot prom code