Merge with master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
David Woodhouse [Thu, 2 Jun 2005 15:39:11 +0000 (16:39 +0100)]
1  2 
arch/ppc/Kconfig
init/Kconfig
kernel/signal.c

Simple merge
diff --cc init/Kconfig
Simple merge
diff --cc kernel/signal.c
Simple merge