Merge branch 'master' of /home/wd/git/u-boot/custodians

arch/powerpc/cpu/mpc85xx/Makefile

arch/powerpc/cpu/mpc85xx/cpu.c

arch/powerpc/cpu/mpc85xx/cpu_init.c

arch/powerpc/cpu/mpc85xx/fdt.c

arch/powerpc/cpu/mpc85xx/mpc8536_serdes.c

arch/powerpc/cpu/mpc85xx/p1022_serdes.c

arch/powerpc/cpu/mpc8xxx/cpu.c

arch/powerpc/cpu/ppc4xx/4xx_ibm_ddr2_autocalib.c

arch/powerpc/cpu/ppc4xx/Makefile

arch/powerpc/cpu/ppc4xx/cmd_ecctest.c

arch/powerpc/cpu/ppc4xx/ecc.c

arch/powerpc/cpu/ppc4xx/traps.c

arch/powerpc/include/asm/config.h

arch/powerpc/include/asm/fsl_pci.h

arch/powerpc/include/asm/fsl_serdes.h

arch/powerpc/include/asm/immap_85xx.h

arch/powerpc/include/asm/immap_86xx.h

arch/powerpc/include/asm/ppc4xx-sdram.h

arch/powerpc/include/asm/processor.h

board/amcc/canyonlands/canyonlands.c