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

arch/arm/cpu/arm1136/mx31/timer.c

arch/arm/cpu/arm1136/mx35/generic.c

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

arch/arm/imx-common/cpu.c

arch/arm/include/asm/arch-mx31/clock.h

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

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

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

board/davedenx/qong/qong.c

board/freescale/mx31pdk/mx31pdk.c

board/freescale/mx51evk/mx51evk.c

board/freescale/mx51evk/mx51evk_video.c

board/freescale/mx53loco/mx53loco.c

board/freescale/mx53loco/mx53loco_video.c

board/hale/tt01/tt01.c

doc/README.watchdog

drivers/watchdog/Makefile

drivers/watchdog/imx_watchdog.c

include/configs/mx28evk.h

include/configs/mx31pdk.h