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

Conflicts:

	include/asm-arm/arch-imx/imx-regs.h

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