Merge ../linux-2.6

[powerpc.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index 141c222..07e7fd8 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1147,6 +1147,12 @@ L:       linux-hams@vger.kernel.org
 W:     http://www.nt.tuwien.ac.at/~kkudielk/Linux/
 S:     Maintained
 
+HIGHPOINT ROCKETRAID 3xxx RAID DRIVER
+P:     HighPoint Linux Team
+M:     linux@highpoint-tech.com
+W:     http://www.highpoint-tech.com
+S:     Supported
+
 HIPPI
 P:     Jes Sorensen
 M:     jes@trained-monkey.org
@@ -1889,6 +1895,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