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

Conflicts:
	drivers/mmc/core/core.c
	drivers/mmc/core/sd.c

diff --cc arch/arm/mach-at91/at91sam9260_devices.c
index 7f570b5b2a09ca51cd07fe657eccc3808592fb38,c49e84a39a6fe5ce61edd323c371617f8089addf..6bfcd484d4347591c26a0a6a23dded8a1b46f62d
--- 1/arch/arm/mach-at91/at91sam9260_devices.c
--- 2/arch/arm/mach-at91/at91sam9260_devices.c
+++ b/arch/arm/mach-at91/at91sam9260_devices.c
@@@ -327,10 -319,10 +327,10 @@@ void __init at91_add_device_mci(short m
        if (!data)
                return;
  
-       for (i = 0; i < ATMEL_MCI_MAX_NR_SLOTS; i++) {
+       for (i = 0; i < ATMCI_MAX_NR_SLOTS; i++) {
                if (data->slot[i].bus_width) {
                        /* input/irq */
 -                      if (data->slot[i].detect_pin) {
 +                      if (gpio_is_valid(data->slot[i].detect_pin)) {
                                at91_set_gpio_input(data->slot[i].detect_pin, 1);
                                at91_set_deglitch(data->slot[i].detect_pin, 1);
                        }

diff --cc arch/arm/mach-shmobile/board-ag5evm.c
Simple merge

diff --cc arch/arm/mach-shmobile/board-mackerel.c
Simple merge

diff --cc drivers/mmc/card/block.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/sdhci-tegra.c
Simple merge