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

MAINTAINERS

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

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

arch/arm/imx-common/Makefile

arch/arm/imx-common/cmd_hdmidet.c

arch/arm/imx-common/timer.c

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

board/boundary/nitrogen6x/nitrogen6x.c

board/freescale/mx6qsabreauto/mx6qsabreauto.c

board/freescale/mx6qsabrelite/README

board/freescale/mx6qsabrelite/mx6qsabrelite.c

board/freescale/mx6qsabresd/mx6qsabresd.c

board/wandboard/Makefile

board/wandboard/README

board/wandboard/wandboard.c

boards.cfg

doc/README.mx28evk

drivers/mmc/fsl_esdhc.c

drivers/spi/mxc_spi.c

include/configs/mx23_olinuxino.h