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

arch/arm/Kconfig

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

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

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

arch/arm/dts/Makefile

arch/arm/dts/imx6q-sabreauto.dts

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

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

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

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

arch/arm/include/asm/imx-common/mxc_i2c.h

board/compulab/cm_fx6/Kconfig

board/compulab/cm_fx6/MAINTAINERS

board/compulab/cm_fx6/Makefile

board/compulab/cm_fx6/cm_fx6.c

board/compulab/cm_fx6/common.c

board/compulab/cm_fx6/common.h

board/compulab/cm_fx6/imximage.cfg

board/compulab/cm_fx6/spl.c

board/compulab/common/eeprom.c