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

arch/arm/Kconfig

arch/arm/dts/Makefile

arch/arm/dts/imx6q-cm-fx6.dts

arch/arm/mach-imx/cpu.c

arch/arm/mach-rmobile/include/mach/sh_sdhi.h

board/compulab/cm_fx6/cm_fx6.c

cmd/Makefile

cmd/blk_common.c

cmd/ide.c

cmd/mmc.c

cmd/sata.c

cmd/scsi.c

cmd/usb.c

common/splash_source.c

configs/cm_fx6_defconfig

configs/imx6q_logic_defconfig

configs/imx6qdl_icore_mmc_defconfig

configs/imx6qdl_icore_rqs_defconfig

configs/imx6ul_geam_mmc_defconfig

configs/imx6ul_geam_nand_defconfig