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

Conflicts:
	MAINTAINERS

diff --cc MAINTAINERS
index 8bf5cc44d2d6b3bdc50342bcf9f200126e10c531,518bf717b02b1837ab363c00b14b2775728755c2..a10fc4126f02cb30c9f363fa8140e241e0f4dbd0
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -1392,9 -1371,7 +1392,10 @@@ T:     git git://git.xilinx.com/linux-xlnx.
  S:    Supported
  F:    arch/arm/mach-zynq/
  F:    drivers/cpuidle/cpuidle-zynq.c
 +N:    zynq
 +N:    xilinx
 +F:    drivers/clocksource/cadence_ttc_timer.c
+ F:    drivers/mmc/host/sdhci-of-arasan.c
  
  ARM SMMU DRIVER
  M:    Will Deacon <will.deacon@arm.com>

diff --cc drivers/mmc/host/Kconfig
Simple merge