]> err.no Git - linux-2.6/commitdiff
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)
* 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


Trivial merge