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

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

arch/arm/imx-common/cpu.c

arch/arm/imx-common/i2c-mxv7.c

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

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

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

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

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

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

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

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

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

board/aristainetos/Kconfig

board/aristainetos/MAINTAINERS

board/aristainetos/aristainetos-v1.c

board/aristainetos/aristainetos-v2.c

board/aristainetos/aristainetos.c