Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/paulus/ppc64-2.6

author Linus Torvalds <torvalds@ppc970.osdl.org>

Thu, 23 Jun 2005 16:49:55 +0000 (09:49 -0700)

committer Linus Torvalds <torvalds@ppc970.osdl.org>

Thu, 23 Jun 2005 16:49:55 +0000 (09:49 -0700)
author Linus Torvalds <torvalds@ppc970.osdl.org>
Thu, 23 Jun 2005 16:49:55 +0000 (09:49 -0700)
committer Linus Torvalds <torvalds@ppc970.osdl.org>
Thu, 23 Jun 2005 16:49:55 +0000 (09:49 -0700)
diff --cc MAINTAINERS
Simple merge
diff --cc arch/ppc64/Kconfig
Simple merge
diff --cc arch/ppc64/kernel/setup.c
Simple merge
author	Linus Torvalds <torvalds@ppc970.osdl.org>
	Thu, 23 Jun 2005 16:49:55 +0000 (09:49 -0700)
committer	Linus Torvalds <torvalds@ppc970.osdl.org>
	Thu, 23 Jun 2005 16:49:55 +0000 (09:49 -0700)
		1	2
MAINTAINERS	patch \|	diff1 \|	diff2 \|	blob \| history
arch/ppc64/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history
arch/ppc64/kernel/setup.c	patch \|	diff1 \|	diff2 \|	blob \| history