]> err.no Git - linux-2.6/commit
projects / linux-2.6 / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 3668805 48c946a)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Fri, 8 Feb 2008 17:29:39 +0000 (09:29 -0800)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Fri, 8 Feb 2008 17:29:39 +0000 (09:29 -0800)
commitf3aafa6c2535d36542a6dfc8647cd2fdb5999648
tree6d0ffd38855ffe3710a05b169587438447ebebc0tree | snapshot
parent3668805a544a6229d6135a4427b8dfe7c343b61fcommit | diff
parent48c946a482661d8466cd24bae5df749147ff1b1dcommit | diff
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
arch/sparc64/Kconfig diff1 | diff2 | blob | history
Linux 2.6 source tree