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

Conflicts:
	drivers/mmc/host/davinci_mmc.c
	drivers/mmc/host/omap.c

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/mmc/host/atmel-mci.c
Simple merge

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

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

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

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

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

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