Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/paulus/ppc64-2.6
commit24665cd00dd06c741ef6268515ca9e6d3cda5c57
authorLinus Torvalds <torvalds@ppc970.osdl.org>
Thu, 23 Jun 2005 16:49:55 +0000 (23 09:49 -0700)
committerLinus Torvalds <torvalds@ppc970.osdl.org>
Thu, 23 Jun 2005 16:49:55 +0000 (23 09:49 -0700)
treed55e925db2b78bc6529965fa6b1df07a76b56610
parentfed2fc18a4567d613cd35115322257c6c6c710e9
parentd7152fe14cad075d6dd4ee4194acd131aed0244e
Merge /pub/scm/linux/kernel/git/paulus/ppc64-2.6
MAINTAINERS
arch/ppc64/Kconfig
arch/ppc64/kernel/setup.c