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

arch/arm/Kconfig

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

arch/arm/cpu/armv7/vf610/generic.c

arch/arm/imx-common/cpu.c

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

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

board/aristainetos/aristainetos.c

board/freescale/mx6slevk/mx6slevk.c

board/freescale/mx6sxsabresd/mx6sxsabresd.c

board/solidrun/hummingboard/hummingboard.c

board/tbs/tbs2910/Kconfig

drivers/block/dwc_ahsata.c

drivers/misc/mxc_ocotp.c

drivers/misc/mxs_ocotp.c

drivers/thermal/imx_thermal.c

include/config_fallbacks.h

include/configs/mx53loco.h

include/configs/mx6sabre_common.h

include/configs/mx6sxsabresd.h

include/configs/tbs2910.h