Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6

[linux-2.6-omap-h63xx.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index 16646801105c87f165d9cebb7f29a70facd0a6b0..8a1360045c2d65024b5cc5ff14db6ca214148bbe 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -726,34 +726,8 @@ M: rpurdie@rpsys.net
 S:     Maintained
 
 BLACKFIN ARCHITECTURE
-P:     Aubrey Li
-M:     aubrey.li@analog.com
-P:     Bernd Schmidt
-M:     bernd.schmidt@analog.com
 P:     Bryan Wu
 M:     bryan.wu@analog.com
-P:     Grace Pan
-M:     grace.pan@analog.com
-P:     Marc Hoffman
-M:     marc.hoffman@analog.com
-P:     Michael Hennerich
-M:     michael.hennerich@analog.com
-P:     Mike Frysinger
-M:     michael.frysinger@analog.com
-P:     Jerry Zeng
-M:     jerry.zeng@analog.com
-P:     Jie Zhang
-M:     jie.zhang@analog.com
-P:     Robin Getz
-M:     robin.getz@analog.com
-P:     Roy Huang
-M:     roy.huang@analog.com
-P:     Sonic Zhang
-M:     sonic.zhang@analog.com
-P:     Vivi Li
-M:     vivi.li@analog.com
-P:     Yi Li
-M:     yi.li@analog.com
 L:     uclinux-dist-devel@blackfin.uclinux.org (subscribers-only)
 W:     http://blackfin.uclinux.org
 S:     Supported
@@ -2596,12 +2570,18 @@ L:      linux-kernel@vger.kernel.org
 W:     http://www.atnf.csiro.au/~rgooch/linux/kernel-patches.html
 S:     Maintained
 
-MULTIMEDIA CARD (MMC) AND SECURE DIGITAL (SD) SUBSYSTEM
+MULTIMEDIA CARD (MMC), SECURE DIGITAL (SD) AND SDIO SUBSYSTEM
 P:     Pierre Ossman
 M:     drzeus-mmc@drzeus.cx
 L:     linux-kernel@vger.kernel.org
 S:     Maintained
 
+MULTIMEDIA CARD (MMC) ETC. OVER SPI
+P:     David Brownell
+M:     dbrownell@users.sourceforge.net
+L:     linux-kernel@vger.kernel.org
+S:     Odd fixes
+
 MULTISOUND SOUND DRIVER
 P:     Andrew Veliath
 M:     andrewtv@usa.net
@@ -4249,6 +4229,13 @@ W:       http://oss.sgi.com/projects/xfs
 T:     git git://oss.sgi.com:8090/xfs/xfs-2.6.git
 S:     Supported
 
+XILINX SYSTEMACE DRIVER
+P:     Grant Likely
+M:     grant.likely@secretlab.ca
+W:     http://www.secretlab.ca/
+L:     linux-kernel@vger.kernel.org
+S:     Maintained
+
 XILINX UARTLITE SERIAL DRIVER
 P:     Peter Korsgaard
 M:     jacmet@sunsite.dk