Merge branch 'for_paulus' of master.kernel.org:/pub/scm/linux/kernel/git/galak/powerpc
Paul Mackerras [Wed, 28 Jun 2006 06:10:53 +0000 (16:10 +1000)]
1  2 
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

Simple merge
Simple merge