Merge branch 'master' of git://git.denx.de/u-boot-mpc85xx

arch/powerpc/cpu/mpc85xx/p5040_ids.c

arch/powerpc/cpu/mpc85xx/portals.c

arch/powerpc/cpu/mpc85xx/tlb.c

board/freescale/t104xrdb/ddr.c

board/freescale/t104xrdb/spl.c

board/freescale/t104xrdb/t104xrdb.c

drivers/crypto/fsl/jr.c

drivers/ddr/fsl/ctrl_regs.c

drivers/net/fm/init.c

drivers/qe/qe.c

include/configs/B4860QDS.h

include/configs/BSC9131RDB.h

include/configs/BSC9132QDS.h

include/configs/P1023RDB.h

include/configs/P2041RDB.h

include/configs/T102xQDS.h

include/configs/T102xRDB.h

include/configs/T1040QDS.h

include/configs/T104xRDB.h

include/configs/T208xQDS.h