Merge remote-tracking branch 'mpc5xxx/next'

diff --cc arch/powerpc/platforms/52xx/mpc52xx_lpbfifo.c
Simple merge

diff --cc arch/powerpc/sysdev/Makefile
Simple merge

diff --cc drivers/ata/pata_mpc52xx.c
Simple merge

diff --cc drivers/dma/bestcomm/bestcomm.c
Simple merge

diff --cc drivers/video/fsl-diu-fb.c
Simple merge