Merge branch 'u-boot-imx/master' into 'u-boot-arm/master'

arch/arm/cpu/arm926ejs/mxs/Makefile

arch/arm/cpu/arm926ejs/mxs/mxsimage.mx23.cfg

arch/arm/cpu/arm926ejs/mxs/mxsimage.mx28.cfg

arch/arm/cpu/arm926ejs/mxs/spl_power_init.c

arch/arm/cpu/arm926ejs/mxs/start.S

arch/arm/cpu/armv7/mx5/lowlevel_init.S

arch/arm/cpu/armv7/mx6/clock.c

arch/arm/include/asm/arch-mx6/crm_regs.h

arch/arm/include/asm/arch-mx6/mx6dl_pins.h

arch/arm/include/asm/arch-mxs/sys_proto.h

board/boundary/nitrogen6x/6x_upgrade.txt

board/ppcag/bg0900/Makefile

board/ppcag/bg0900/bg0900.c

board/ppcag/bg0900/spl_boot.c

board/udoo/Makefile

board/udoo/udoo.c

board/wandboard/README

boards.cfg

doc/README.mxs

drivers/watchdog/imx_watchdog.c