Merge with master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6.git

diff --cc arch/i386/kernel/ptrace.c
Simple merge

diff --cc arch/ia64/kernel/ptrace.c
Simple merge

diff --cc arch/mips/kernel/ptrace.c
Simple merge

diff --cc arch/ppc64/kernel/ptrace.c
Simple merge

diff --cc arch/s390/kernel/ptrace.c
Simple merge

diff --cc arch/um/kernel/ptrace.c
Simple merge

diff --cc arch/x86_64/kernel/ptrace.c
Simple merge

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

diff --cc init/Kconfig
Simple merge