Merge branch 'for_paulus' of master.kernel.org:/pub/scm/linux/kernel/git/galak/powerpc

diff --cc arch/powerpc/platforms/86xx/mpc86xx_hpcn.c
Simple merge

diff --cc arch/powerpc/platforms/86xx/mpc86xx_smp.c
Simple merge

diff --cc arch/powerpc/platforms/86xx/pci.c
Simple merge

diff --cc include/asm-powerpc/mpc86xx.h
Simple merge