Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/drzeus/mmc

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/drzeus/mmc: (42 commits)
  atmel-mci: fix sdc_reg typo
  tmio_mmc: add maintainer
  mmc: Add OpenFirmware bindings for SDHCI driver
  sdhci: Add quirk for forcing maximum block size to 2048 bytes
  sdhci: Add quirk for controllers that need IRQ re-init after reset
  sdhci: Add quirk for controllers that need small delays for PIO
  sdhci: Add set_clock callback and a quirk for nonstandard clocks
  sdhci: Add get_{max,timeout}_clock callbacks
  sdhci: Add support for hosts reporting inverted write-protect state
  sdhci: Add support for card-detection polling
  sdhci: Enable only relevant (DMA/PIO) interrupts during transfers
  sdhci: Split card-detection IRQs management from sdhci_init()
  sdhci: Add support for bus-specific IO memory accessors
  mmc_spi: adjust for delayed data token response
  omap_hsmmc: Wait for SDBP
  omap_hsmmc: Fix MMC3 dma
  omap_hsmmc: Disable SDBP at suspend
  omap_hsmmc: Do not prefix slot name
  omap_hsmmc: Allow cover switch to cause rescan
  omap_hsmmc: Add 8-bit bus width mode support
  ...

1 files changed, 19 insertions, 1 deletions

diff --git a/MAINTAINERS b/MAINTAINERS
index 6360b9b9bbbd..9e2eb319113b 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -2924,6 +2924,12 @@ M:	buytenh@marvell.com
 L:      netdev@vger.kernel.org
 S:      Supported
 
+MARVELL SOC MMC/SD/SDIO CONTROLLER DRIVER
+P:      Nicolas Pitre
+M:      nico@cam.org
+L:      linux-kernel@vger.kernel.org
+S:      Maintained
+
 MARVELL YUKON / SYSKONNECT DRIVER
 P:      Mirko Lindner
 M:      mlindner@syskonnect.de
@@ -3916,7 +3922,14 @@ S:	Maintained
 SECURE DIGITAL HOST CONTROLLER INTERFACE (SDHCI) DRIVER
 P:      Pierre Ossman
 M:      drzeus-sdhci@drzeus.cx
-L:      sdhci-devel@list.drzeus.cx
+L:      sdhci-devel@lists.ossman.eu
+S:      Maintained
+
+SECURE DIGITAL HOST CONTROLLER INTERFACE, OPEN FIRMWARE BINDINGS (SDHCI-OF)
+P:      Anton Vorontsov
+M:      avorontsov@ru.mvista.com
+L:      linuxppc-dev@ozlabs.org
+L:      sdhci-devel@lists.ossman.eu
 S:      Maintained
 
 SECURITY SUBSYSTEM
@@ -4394,6 +4407,11 @@ L:	tlinux-users@tce.toshiba-dme.co.jp
 W:      http://www.buzzard.org.uk/toshiba/
 S:      Maintained
 
+TMIO MMC DRIVER
+P:      Ian Molton
+M:      ian@mnementh.co.uk
+S:      Maintained
+
 TPM DEVICE DRIVER
 P:      Debora Velarde
 M:      debora@linux.vnet.ibm.com