Merge branch 'for_paulus' of master.kernel.org:/pub/scm/linux/kernel/git/galak/powerpc
commit489244498ec99c949ecbd7105299066cff283dcd
authorPaul Mackerras <paulus@samba.org>
Wed, 28 Jun 2006 06:10:53 +0000 (28 16:10 +1000)
committerPaul Mackerras <paulus@samba.org>
Wed, 28 Jun 2006 06:10:53 +0000 (28 16:10 +1000)
tree003b5637cb8998ca0ab524e436c1a5eff25a9a1c
parent649e85797259162f7fdc696420e7492f20226f2d
parent9ad494f62444ee37209e85173377c67612e66ef1
Merge branch 'for_paulus' of /linux/kernel/git/galak/powerpc
arch/powerpc/platforms/86xx/mpc86xx_hpcn.c
arch/powerpc/platforms/86xx/mpc86xx_smp.c
arch/powerpc/platforms/86xx/pci.c
include/asm-powerpc/mpc86xx.h