Merge remote-tracking branch 'mmc/mmc-next'

diff --cc drivers/mmc/core/bus.c
Simple merge

diff --cc drivers/mmc/core/debugfs.c
Simple merge

diff --cc drivers/mmc/core/host.c
Simple merge

diff --cc drivers/mmc/core/mmc.c
Simple merge

diff --cc drivers/mmc/core/sd.c
Simple merge

diff --cc drivers/mmc/core/sdio_io.c
Simple merge

diff --cc drivers/mmc/host/at91_mci.c
Simple merge

diff --cc drivers/mmc/host/mmci.c
Simple merge

diff --cc drivers/mmc/host/mxcmmc.c
Simple merge

diff --cc drivers/mmc/host/mxs-mmc.c
Simple merge

diff --cc drivers/mmc/host/omap_hsmmc.c
Simple merge

diff --cc drivers/mmc/host/s3cmci.c
Simple merge

diff --cc drivers/mmc/host/sdhci-esdhc-imx.c
Simple merge

diff --cc drivers/mmc/host/sdhci-s3c.c
Simple merge

diff --cc drivers/mmc/host/sdhci-tegra.c
Simple merge

diff --cc drivers/mmc/host/sh_mmcif.c
Simple merge