Merge with master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
David Woodhouse [Tue, 3 May 2005 07:14:09 +0000 (08:14 +0100)]
1  2 
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

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc fs/proc/base.c
Simple merge
diff --cc init/Kconfig
Simple merge