X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=MAINTAINERS;h=b1114cfac6bf22b9d7fc015af9cad2e628b0bbcb;hb=091bd2e993fcb1094a23e36157285b62bc87afdf;hp=79471ba4981b3d06ad607da039d31acfa46c24c7;hpb=dbe63a2cde07f4bccb2b2e4b35241491d8e096f6;p=deliverable%2Flinux.git

diff --git a/MAINTAINERS b/MAINTAINERS
index 79471ba4981b..b1114cfac6bf 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -3420,8 +3420,7 @@ S:	Supported
 F:	drivers/mfd/
 
 MULTIMEDIA CARD (MMC), SECURE DIGITAL (SD) AND SDIO SUBSYSTEM
-M:	Pierre Ossman <pierre@ossman.eu>
-S:	Maintained
+S:	Orphan
 F:	drivers/mmc/
 F:	include/linux/mmc/
 
@@ -4996,7 +4995,9 @@ T:	git git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial.git
 S:	Maintained
 
 TTY LAYER
-S:	Orphan
+M:	Greg Kroah-Hartman <gregkh@suse.de>
+S:	Maintained
+T:	quilt kernel.org/pub/linux/kernel/people/gregkh/gregkh-2.6/
 F:	drivers/char/tty_*
 F:	drivers/serial/serial_core.c
 F:	include/linux/serial_core.h