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

arch/powerpc/cpu/mpc85xx/Makefile

arch/powerpc/cpu/mpc85xx/cmd_errata.c

arch/powerpc/cpu/mpc85xx/cpu.c

arch/powerpc/cpu/mpc85xx/ddr-gen3.c

arch/powerpc/cpu/mpc85xx/fsl_corenet_serdes.c

arch/powerpc/cpu/mpc85xx/p2040_serdes.c

arch/powerpc/cpu/mpc85xx/p3041_ids.c

arch/powerpc/cpu/mpc85xx/p3041_serdes.c

arch/powerpc/cpu/mpc85xx/p5020_ids.c

arch/powerpc/cpu/mpc85xx/p5020_serdes.c

arch/powerpc/cpu/mpc85xx/speed.c

arch/powerpc/cpu/mpc85xx/u-boot.lds

arch/powerpc/cpu/mpc8xxx/cpu.c

arch/powerpc/cpu/mpc8xxx/ddr/ctrl_regs.c

arch/powerpc/cpu/mpc8xxx/ddr/ddr.h

arch/powerpc/cpu/mpc8xxx/ddr/lc_common_dimm_params.c

arch/powerpc/cpu/mpc8xxx/ddr/main.c

arch/powerpc/cpu/mpc8xxx/ddr/options.c

arch/powerpc/include/asm/config.h

arch/powerpc/include/asm/config_mpc85xx.h