1 files changed, 7 insertions, 10 deletions

diff --git a/MAINTAINERS b/MAINTAINERS
index eae3cd86831e..e73060fe0788 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1544,7 +1544,7 @@ S:	Supported
 F:      drivers/rtc/rtc-bfin.c
 
 BLACKFIN SDH DRIVER
-M:      Cliff Cai <cliff.cai@analog.com>
+M:      Sonic Zhang <sonic.zhang@analog.com>
 L:      uclinux-dist-devel@blackfin.uclinux.org
 W:      http://blackfin.uclinux.org
 S:      Supported
@@ -1958,10 +1958,10 @@ S:	Supported
 F:      drivers/platform/x86/classmate-laptop.c
 
 COCCINELLE/Semantic Patches (SmPL)
-M:      Julia Lawall <julia@diku.dk>
+M:      Julia Lawall <Julia.Lawall@lip6.fr>
 M:      Gilles Muller <Gilles.Muller@lip6.fr>
-M:      Nicolas Palix <npalix.work@gmail.com>
-L:      cocci@diku.dk (moderated for non-subscribers)
+M:      Nicolas Palix <nicolas.palix@imag.fr>
+L:      cocci@systeme.lip6.fr (moderated for non-subscribers)
 W:      http://coccinelle.lip6.fr/
 S:      Supported
 F:      scripts/coccinelle/
@@ -2423,11 +2423,6 @@ S:	Maintained
 F:      Documentation/hwmon/dme1737
 F:      drivers/hwmon/dme1737.c
 
-DOCBOOK FOR DOCUMENTATION
-M:      Randy Dunlap <rdunlap@xenotime.net>
-S:      Maintained
-F:      scripts/kernel-doc
-
 DOCKING STATION DRIVER
 M:      Shaohua Li <shaohua.li@intel.com>
 L:      linux-acpi@vger.kernel.org
@@ -5207,8 +5202,10 @@ S:	Maintained
 F:      drivers/mmc/host/omap.c
 
 OMAP HS MMC SUPPORT
+M:      Venkatraman S <svenkatr@ti.com>
+L:      linux-mmc@vger.kernel.org
 L:      linux-omap@vger.kernel.org
-S:      Orphan
+S:      Maintained
 F:      drivers/mmc/host/omap_hsmmc.c
 
 OMAP RANDOM NUMBER GENERATOR SUPPORT