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

[pandora-kernel.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index 72b979d..789fed6 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -4585,9 +4585,8 @@ S:        Maintained
 F:     drivers/mmc/host/omap.c
 
 OMAP HS MMC SUPPORT
 F:     drivers/mmc/host/omap.c
 
 OMAP HS MMC SUPPORT

-M:     Madhusudhan Chikkature <madhu.cr@ti.com>

 L:     linux-omap@vger.kernel.org
 L:     linux-omap@vger.kernel.org

-S:     Maintained
+S:     Orphan

 F:     drivers/mmc/host/omap_hsmmc.c
 
 OMAP RANDOM NUMBER GENERATOR SUPPORT
 F:     drivers/mmc/host/omap_hsmmc.c
 
 OMAP RANDOM NUMBER GENERATOR SUPPORT


@@ -6243,9 +6242,14 @@ F:       drivers/char/toshiba.c
 F:     include/linux/toshiba.h
 
 TMIO MMC DRIVER
 F:     include/linux/toshiba.h
 
 TMIO MMC DRIVER

+M:     Guennadi Liakhovetski <g.liakhovetski@gmx.de>

 M:     Ian Molton <ian@mnementh.co.uk>
 M:     Ian Molton <ian@mnementh.co.uk>

+L:     linux-mmc@vger.kernel.org

 S:     Maintained
 S:     Maintained

-F:     drivers/mmc/host/tmio_mmc.*
+F:     drivers/mmc/host/tmio_mmc*
+F:     drivers/mmc/host/sh_mobile_sdhi.c
+F:     include/linux/mmc/tmio.h
+F:     include/linux/mmc/sh_mobile_sdhi.h

 
 TMPFS (SHMEM FILESYSTEM)
 M:     Hugh Dickins <hughd@google.com>
 
 TMPFS (SHMEM FILESYSTEM)
 M:     Hugh Dickins <hughd@google.com>