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

arch/powerpc/cpu/mpc83xx/serdes.c

arch/powerpc/cpu/mpc85xx/cpu.c

arch/powerpc/cpu/mpc85xx/cpu_init.c

arch/powerpc/cpu/mpc85xx/speed.c

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

arch/powerpc/cpu/mpc8xxx/pci_cfg.c

arch/powerpc/include/asm/fsl_ddr_sdram.h

arch/powerpc/include/asm/fsl_lbc.h

arch/powerpc/include/asm/fsl_mpc83xx_serdes.h

arch/powerpc/include/asm/immap_85xx.h

board/freescale/mpc837xemds/mpc837xemds.c

board/freescale/mpc837xemds/pci.c

board/freescale/mpc837xerdb/mpc837xerdb.c

board/freescale/p1_p2_rdb/p1_p2_rdb.c

drivers/block/fsl_sata.c

drivers/block/fsl_sata.h

include/configs/socrates.h