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

author David Woodhouse <dwmw2@shinybook.infradead.org>

Thu, 2 Jun 2005 15:39:11 +0000 (16:39 +0100)

committer David Woodhouse <dwmw2@shinybook.infradead.org>

Thu, 2 Jun 2005 15:39:11 +0000 (16:39 +0100)
author David Woodhouse <dwmw2@shinybook.infradead.org>
Thu, 2 Jun 2005 15:39:11 +0000 (16:39 +0100)
committer David Woodhouse <dwmw2@shinybook.infradead.org>
Thu, 2 Jun 2005 15:39:11 +0000 (16:39 +0100)
diff --cc arch/ppc/Kconfig
Simple merge
diff --cc init/Kconfig
Simple merge
diff --cc kernel/signal.c
Simple merge
author	David Woodhouse <dwmw2@shinybook.infradead.org>
	Thu, 2 Jun 2005 15:39:11 +0000 (16:39 +0100)
committer	David Woodhouse <dwmw2@shinybook.infradead.org>
	Thu, 2 Jun 2005 15:39:11 +0000 (16:39 +0100)
		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