Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/paulus/ppc64-2.6
Linus Torvalds [Thu, 23 Jun 2005 16:49:55 +0000 (09:49 -0700)]
1  2 
MAINTAINERS
arch/ppc64/Kconfig
arch/ppc64/kernel/setup.c

diff --cc MAINTAINERS
Simple merge
Simple merge
Simple merge