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

Makefile

board/amcc/canyonlands/bootstrap.c

board/amcc/canyonlands/init.S

board/amcc/canyonlands/u-boot-nand.lds

board/esd/apc405/Makefile

board/esd/apc405/apc405.c

board/esd/apc405/fpgadata.c

board/esd/apc405/logo_640_480_24bpp.c

board/esd/apc405/strataflash.c

board/esd/common/auto_update.c

board/esd/common/auto_update.h

board/esd/common/lcd.c

board/esd/common/s1d13505_640_480_16bpp.h

board/esd/pmc440/cmd_pmc440.c

cpu/ppc4xx/cache.S

cpu/ppc4xx/speed.c

include/configs/APC405.h

include/configs/canyonlands.h

nand_spl/board/amcc/canyonlands/config.mk

nand_spl/board/amcc/canyonlands/ddr2_fixed.c