Merge with master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
authorDavid Woodhouse <dwmw2@shinybook.infradead.org>
Tue, 3 May 2005 07:14:09 +0000 (08:14 +0100)
committerDavid Woodhouse <dwmw2@shinybook.infradead.org>
Tue, 3 May 2005 07:14:09 +0000 (08:14 +0100)
commit27b030d58c8e72fc7a95187a791bd9406e350f02
treeab3bab7f39a5ce5bab65578a7e08fa4dfdeb198c
parent79d20b14a0d651f15b0ef9a22b6cf12d284a6d38
parent6628465e33ca694bd8fd5c3cf4eb7ff9177bc694
Merge ... /linux/kernel/git/torvalds/linux-2.6.git
arch/i386/kernel/ptrace.c
arch/ia64/kernel/ptrace.c
arch/mips/kernel/ptrace.c
arch/ppc64/kernel/ptrace.c
arch/s390/kernel/ptrace.c
arch/um/kernel/ptrace.c
arch/x86_64/kernel/ptrace.c
fs/proc/base.c
init/Kconfig