| commit | f3aafa6c2535d36542a6dfc8647cd2fdb5999648 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | Fri Feb 08 09:29:39 2008 -0800 |
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | Fri Feb 08 09:29:39 2008 -0800 |
| tree | 6d0ffd38855ffe3710a05b169587438447ebebc0 | |
| parent | 3668805a544a6229d6135a4427b8dfe7c343b61f [diff] | |
| parent | 48c946a482661d8466cd24bae5df749147ff1b1d [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