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: (25 commits)
  atmel-mci: add MCI2 register definitions
  atmel-mci: Integrate AT91 specific definition in header file
  tmio_mmc: allow compilation for ASIC3
  mmc_block: do not DMA to stack
  sdhci: Print ADMA status and pointer on debug
  tmio_mmc: fix clock setup
  tmio_mmc: map SD control registers after enabling the MFD cell
  tmio_mmc: correct probe return value for num_resources != 3
  tmio_mmc: don't use set_irq_type
  tmio_mmc: add bus_shift support
  MFD,mmc: tmio_mmc: make HCLK configurable
  mmc_spi: don't use EINVAL for possible transmission errors
  cb710: more cleanup for the DEBUG case.
  sdhci: platform driver for SDHCI
  mxcmmc: remove frequency workaround
  cb710: handle DEBUG define in Makefile
  cb710: add missing parenthesis
  cb710: fix printk format string
  mmc: Driver for CB710/720 memory card reader (MMC part)
  pxamci: add regulator support.
  ...

1 files changed, 9 insertions, 0 deletions

diff --git a/MAINTAINERS b/MAINTAINERS
index 9e28c5c16602..a1fe87ad4832 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -2112,6 +2112,15 @@ W:	http://sourceforge.net/projects/lpfcxxxx
 S:      Supported
 F:      drivers/scsi/lpfc/
 
+ENE CB710 FLASH CARD READER DRIVER
+P:      Michał Mirosław
+M:      mirq-linux@rere.qmqm.pl
+L:      linux-kernel@vger.kernel.org
+S:      Maintained
+F:      drivers/misc/cb710/
+F:      drivers/mmc/host/cb710-mmc.*
+F:      include/linux/cb710.h
+
 EPSON 1355 FRAMEBUFFER DRIVER
 P:      Christopher Hoover
 M:      ch@murgatroid.com