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/mx6/soc.c

arch/arm/imx-common/iomux-v3.c

arch/arm/imx-common/timer.c

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

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

arch/arm/include/asm/imx-common/iomux-v3.h

board/aristainetos/aristainetos.c

board/bachmann/ot1200/ot1200.c

board/compulab/cm_fx6/cm_fx6.c

board/compulab/cm_fx6/spl.c

board/freescale/mx6qsabreauto/mx6qsabreauto.c

board/freescale/mx6sabresd/mx6sabresd.c

board/freescale/mx6slevk/mx6slevk.c

board/kosagi/novena/Kconfig

board/kosagi/novena/Makefile

board/kosagi/novena/novena.c

board/kosagi/novena/novena_spl.c

board/kosagi/novena/setup.cfg