From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 11 May 2008 16:55:48 +0000 (-0700)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6
X-Git-Tag: v3.12-rc1~20793
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=854a989546c12683186c84601d4902591dddd8a9;p=kernel%2Fkernel-generic.git

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
---

854a989546c12683186c84601d4902591dddd8a9