Merge branch 'audit.b32' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/audit...

[linux-2.6] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index b62ab43c60941e3c2195c31663aca05a5b58f59e..8c35b3c503aa842e0258a949f2ef8633e541db01 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -144,11 +144,9 @@ L: netdev@vger.kernel.org
 S:     Maintained
 
 8250/16?50 (AND CLONE UARTS) SERIAL DRIVER
-P:     Russell King
-M:     rmk+serial@arm.linux.org.uk
 L:     linux-serial@vger.kernel.org
 W:     http://serial.sourceforge.net
-S:     Maintained
+S:     Orphan
 
 8390 NETWORK DRIVERS [WD80x3/SMC-ELITE, SMC-ULTRA, NE2000, 3C503, etc.]
 P:     Paul Gortmaker
@@ -979,6 +977,13 @@ L: ebtables-devel@lists.sourceforge.net
 W:     http://ebtables.sourceforge.net/
 S:     Maintained
 
+ECRYPT FILE SYSTEM
+P:     Mike Halcrow, Phillip Hellewell
+M:     mhalcrow@us.ibm.com, phillip@hellewell.homeip.net
+L:     ecryptfs-devel@lists.sourceforge.net
+W:     http://ecryptfs.sourceforge.net/
+S:     Supported
+
 EDAC-CORE
 P:     Doug Thompson
 M:     norsk5@xmission.com
@@ -1895,11 +1900,6 @@ M:       rroesler@syskonnect.de
 W:     http://www.syskonnect.com
 S:     Supported
 
-MAESTRO PCI SOUND DRIVERS
-P:     Zach Brown
-M:     zab@zabbo.net
-S:     Odd Fixes
-
 MAN-PAGES: MANUAL PAGES FOR LINUX -- Sections 2, 3, 4, 5, and 7
 P: Michael Kerrisk
 M: mtk-manpages@gmx.net
@@ -1986,9 +1986,7 @@ W:        http://www.atnf.csiro.au/~rgooch/linux/kernel-patches.html
 S:     Maintained
 
 MULTIMEDIA CARD (MMC) SUBSYSTEM
-P:     Russell King
-M:     rmk+mmc@arm.linux.org.uk
-S:     Maintained
+S:     Orphan
 
 MULTISOUND SOUND DRIVER
 P:     Andrew Veliath
@@ -2438,6 +2436,19 @@ M:       mporter@kernel.crashing.org
 L:     linux-kernel@vger.kernel.org
 S:     Maintained
 
+READ-COPY UPDATE (RCU)
+P:     Dipankar Sarma
+M:     dipankar@in.ibm.com
+W:     http://www.rdrop.com/users/paulmck/rclock/
+L:     linux-kernel@vger.kernel.org
+S:     Supported
+
+RCUTORTURE MODULE
+P:     Josh Triplett
+M:     josh@freedesktop.org
+L:     linux-kernel@vger.kernel.org
+S:     Maintained
+
 REAL TIME CLOCK DRIVER
 P:     Paul Gortmaker
 M:     p_gortmaker@yahoo.com
@@ -2817,17 +2828,13 @@ P:      Paul Mundt
 M:     lethal@linux-sh.org
 L:     linuxsh-dev@lists.sourceforge.net (subscribers-only)
 W:     http://www.linux-sh.org
-W:     http://www.m17n.org/linux-sh/
 S:     Maintained
 
 SUPERH64 (sh64)
 P:     Paul Mundt
 M:     lethal@linux-sh.org
-P:     Richard Curnow
-M:     rc@rc0.org.uk
 L:     linuxsh-shmedia-dev@lists.sourceforge.net
 W:     http://www.linux-sh.org
-W:     http://www.rc0.org.uk/sh64
 S:     Maintained
 
 SUN3/3X
@@ -2862,6 +2869,11 @@ M:       hlhung3i@gmail.com
 W:     http://tcp-lp-mod.sourceforge.net/
 S:     Maintained
 
+TI FLASH MEDIA INTERFACE DRIVER
+P:      Alex Dubov
+M:      oakad@yahoo.com
+S:      Maintained
+
 TI OMAP RANDOM NUMBER GENERATOR SUPPORT
 P:     Deepak Saxena
 M:     dsaxena@plexity.net
@@ -3385,12 +3397,6 @@ M:       Henk.Vergonet@gmail.com
 L:     usbb2k-api-dev@nongnu.org
 S:     Maintained
 
-YMFPCI YAMAHA PCI SOUND (Use ALSA instead)
-P:     Pete Zaitcev
-M:     zaitcev@yahoo.com
-L:     linux-kernel@vger.kernel.org
-S:     Obsolete
-
 Z8530 DRIVER FOR AX.25
 P:     Joerg Reuter
 M:     jreuter@yaina.de