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

arch/powerpc/cpu/mpc85xx/cmd_errata.c

arch/powerpc/cpu/mpc85xx/cpu.c

arch/powerpc/cpu/mpc85xx/cpu_init.c

arch/powerpc/cpu/mpc85xx/fdt.c

arch/powerpc/cpu/mpc85xx/fsl_corenet_serdes.c

arch/powerpc/cpu/mpc85xx/p2041_ids.c

arch/powerpc/cpu/mpc85xx/p3041_ids.c

arch/powerpc/cpu/mpc85xx/p5020_ids.c

arch/powerpc/cpu/mpc85xx/portals.c

arch/powerpc/include/asm/config_mpc85xx.h

arch/powerpc/include/asm/fsl_memac.h

arch/powerpc/include/asm/immap_85xx.h

board/freescale/b4860qds/tlb.c

board/freescale/common/Makefile

board/freescale/common/cds_pci_ft.c

board/freescale/p1010rdb/p1010rdb.c

board/freescale/p1022ds/Makefile

board/freescale/p1022ds/law.c

board/freescale/p1022ds/spl_minimal.c

board/freescale/p1022ds/tlb.c