Merge branch 'master' of ../master

arch/powerpc/lib/bootm.c

board/colibri_pxa270/Makefile

board/colibri_pxa270/colibri_pxa270.c

board/kup/common/kup.c

board/kup/common/kup.h

board/kup/kup4k/kup4k.c

board/kup/kup4k/s1d13706.h

board/kup/kup4x/kup4x.c

board/purple/flash.c

board/vpac270/Makefile

board/vpac270/vpac270.c

boards.cfg

common/cmd_ambapp.c

common/cmd_bootldr.c

common/cmd_bootm.c

common/cmd_cplbinfo.c

common/cmd_cramfs.c

common/cmd_dataflash_mmc_mux.c

common/cmd_license.c

common/cmd_mgdisk.c