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:
  sdhci: remove needless double parenthesis
  sdhci: Specific quirk vor VIA SDHCI controller in VX855ES
  s3cmci: fix dma configuration call
  mmc: Add new via-sdmmc host controller driver
  sdhci: Add support for hosts that are only capable of 1-bit transfers
  MAINTAINERS: add myself as atmel-mci maintainer (sd/mmc interface)
  sdhci: Add SDHCI_QUIRK_NO_MULTIBLOCK quirk
  sdhci: Add better ADMA error reporting
  sdhci-s3c: Samsung S3C based SDHCI controller glue

1 files changed, 22 insertions, 0 deletions

diff --git a/MAINTAINERS b/MAINTAINERS
index dc226e78612c..1d4704300c1d 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1010,6 +1010,13 @@ W:	http://www.at91.com/
 S:      Maintained
 F:      drivers/mmc/host/at91_mci.c
 
+ATMEL AT91 / AT32 MCI DRIVER
+P:      Nicolas Ferre
+M:      nicolas.ferre@atmel.com
+S:      Maintained
+F:      drivers/mmc/host/atmel-mci.c
+F:      drivers/mmc/host/atmel-mci-regs.h
+
 ATMEL AT91 / AT32 SERIAL DRIVER
 P:      Haavard Skinnemoen
 M:      hskinnemoen@atmel.com
@@ -5094,6 +5101,13 @@ L:	sdhci-devel@lists.ossman.eu
 S:      Maintained
 F:      drivers/mmc/host/sdhci.*
 
+SECURE DIGITAL HOST CONTROLLER INTERFACE (SDHCI) SAMSUNG DRIVER
+P:      Ben Dooks
+M:      ben-linux@fluff.org
+L:      sdhci-devel@lists.ossman.eu
+S:      Maintained
+F:      drivers/mmc/host/sdhci-s3c.c
+
 SECURITY SUBSYSTEM
 P:      James Morris
 M:      jmorris@namei.org
@@ -6216,6 +6230,14 @@ S:	Maintained
 F:      Documentation/i2c/busses/i2c-viapro
 F:      drivers/i2c/busses/i2c-viapro.c
 
+VIA SD/MMC CARD CONTROLLER DRIVER
+P:      Joseph Chan
+M:      JosephChan@via.com.tw
+P:      Harald Welte
+M:      HaraldWelte@viatech.com
+S:      Maintained
+F:      drivers/mmc/host/via-sdmmc.c
+
 VIA UNICHROME(PRO)/CHROME9 FRAMEBUFFER DRIVER
 P:      Joseph Chan
 M:      JosephChan@via.com.tw