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

arch/arm/Kconfig

arch/arm/cpu/armv7/mx6/Kconfig

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

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

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

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

arch/arm/imx-common/cpu.c

arch/arm/imx-common/timer.c

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

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

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

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

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

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

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

arch/arm/include/asm/arch-mx6/mx6ul-ddr.h

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

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

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

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