uboot-imx

Merge branch 'master' into next

Conflicts:
	Makefile

Signed-off-by: Wolfgang Denk <wd@denx.de>