aboutsummaryrefslogtreecommitdiffstats
path: root/scripts/patch-kernel
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.linux-foundation.org>2008-02-08 09:29:39 -0800
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2008-02-08 09:29:39 -0800
commitf3aafa6c2535d36542a6dfc8647cd2fdb5999648 (patch)
tree6d0ffd38855ffe3710a05b169587438447ebebc0 /scripts/patch-kernel
parentMerge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6 (diff)
parent[SPARC64]: Make use of the new fs/compat_binfmt_elf.c (diff)
downloadlinux-f3aafa6c2535d36542a6dfc8647cd2fdb5999648.tar.gz
linux-f3aafa6c2535d36542a6dfc8647cd2fdb5999648.zip
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
Diffstat (limited to 'scripts/patch-kernel')
0 files changed, 0 insertions, 0 deletions