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

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/ppc4xx-sdram.h

board/amcc/canyonlands/canyonlands.c

board/t3corp/chip_config.c

board/t3corp/init.S

board/t3corp/t3corp.c

include/configs/canyonlands.h

include/configs/katmai.h

include/configs/t3corp.h