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

arch/arm/imx-common/spl.c

arch/arm/imx-common/video.c

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

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

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

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

board/CarMediaLab/flea3/flea3.c

board/freescale/mx7dsabresd/mx7dsabresd.c

board/ge/bx50v3/bx50v3.c

board/kosagi/novena/novena_spl.c

board/samtec/vining_2000/Kconfig

board/samtec/vining_2000/MAINTAINERS

board/samtec/vining_2000/Makefile

board/samtec/vining_2000/imximage.cfg

board/samtec/vining_2000/vining_2000.c