Merge branch 'from-linus' into upstream

[linux-2.6] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index 141c22269eba366cbd299851ad3bbc07502d028a..c3c5842402df553bc497a594fac2b30b7d4a3b84 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1889,6 +1889,11 @@ L:       linux-kernel@vger.kernel.org
 W:     http://www.atnf.csiro.au/~rgooch/linux/kernel-patches.html
 S:     Maintained
 
+MULTIMEDIA CARD SUBSYSTEM
+P:     Russell King
+M:     rmk+mmc@arm.linux.org.uk
+S:     Maintained
+
 MULTISOUND SOUND DRIVER
 P:     Andrew Veliath
 M:     andrewtv@usa.net