From: Linus Torvalds <torvalds@woody.linux-foundation.org>
Date: Fri, 8 Feb 2008 17:29:39 +0000 (-0800)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6
X-Git-Tag: v2.6.25-rc1~44
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=f3aafa6c2535d36542a6dfc8647cd2fdb5999648;p=linux-2.6-omap-h63xx.git

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6:
  [SPARC64]: Make use of the new fs/compat_binfmt_elf.c
  [SPARC64]: Make use of compat_sys_ptrace()

Manually fixed trivial delete/modift conflict in arch/sparc64/kernel/binfmt_elf32.c
---

f3aafa6c2535d36542a6dfc8647cd2fdb5999648