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:
  mmc_spi: support for non-byte-aligned cards
  omap_hsmmc: Do not expect cmd/data to be non-null when CC/TC occurs
  mmc: Fix compile for omap_hsmmc.c
  mmc_spi: convert timeout handling to jiffies and avoid busy waiting
  mmc_spi: do not check CID and CSD blocks with CRC16
  omap_hsmmc: Flush posted write to IRQ
  New mail address for Pierre Ossman
  imxmmc: move RSSR BLR
  imxmmc: init-exit rework
  mmc: Accept EXT_CSD rev 1.3 since it is backwards compatible with 1.2

1 files changed, 3 insertions, 3 deletions

diff --git a/MAINTAINERS b/MAINTAINERS
index c3b215970f7b..d96e7451891f 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -3057,7 +3057,7 @@ S:	Supported
 
 MULTIMEDIA CARD (MMC), SECURE DIGITAL (SD) AND SDIO SUBSYSTEM
 P:      Pierre Ossman
-M:      drzeus-mmc@drzeus.cx
+M:      pierre@ossman.eu
 L:      linux-kernel@vger.kernel.org
 S:      Maintained
 
@@ -3939,7 +3939,7 @@ S:	Maintained
 
 SECURE DIGITAL HOST CONTROLLER INTERFACE (SDHCI) DRIVER
 P:      Pierre Ossman
-M:      drzeus-sdhci@drzeus.cx
+M:      pierre@ossman.eu
 L:      sdhci-devel@lists.ossman.eu
 S:      Maintained
 
@@ -4926,7 +4926,7 @@ S:	Maintained
 
 W83L51xD SD/MMC CARD INTERFACE DRIVER
 P:      Pierre Ossman
-M:      drzeus-wbsd@drzeus.cx
+M:      pierre@ossman.eu
 L:      linux-kernel@vger.kernel.org
 S:      Maintained