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

arch/arm/Kconfig

arch/arm/cpu/arm926ejs/mxs/spl_boot.c

arch/arm/cpu/arm926ejs/mxs/spl_lradc_init.c

arch/arm/cpu/arm926ejs/mxs/spl_mem_init.c

arch/arm/cpu/arm926ejs/mxs/spl_power_init.c

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

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

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

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

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

board/aristainetos/aristainetos.c

board/bachmann/ot1200/Makefile

board/bachmann/ot1200/mx6q_4x_mt41j128.cfg

board/bachmann/ot1200/ot1200.c

board/bachmann/ot1200/ot1200_spl.c

board/barco/platinum/Kconfig

board/barco/platinum/MAINTAINERS

board/barco/platinum/Makefile

board/barco/platinum/platinum.c

board/barco/platinum/platinum.h