Merge branch 'next' of /home/wd/git/u-boot/nextConflicts: include/ppc4xx.hSigned-off-by: Wolfgang Denk <wd@denx.de>
logos: add Freescale logoAdd the Freescale logo and update the Makefile to build it when buildinga Freescale board.Signed-off-by: Timur Tabi <timur@freescale.com>