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

diff --cc arch/ppc/Kconfig
Simple merge
diff --cc init/Kconfig
Simple merge
diff --cc kernel/signal.c
Simple merge
		1	2
arch/ppc/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history
init/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history
kernel/signal.c	patch \|	diff1 \|	diff2 \|	blob \| history