Merge /spare/repo/linux-2.6/

[linux.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index 19a9a1c530371a9328af010d96d2544e88289378..564a03e61a0c4b2322136ab9d96b3f121391ee83 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -370,6 +370,10 @@ W: http://www.thekelleys.org.uk/atmel
 W:     http://atmelwlandriver.sourceforge.net/
 S:     Maintained
 
+AUDIT SUBSYSTEM
+L:     [email protected] (subscribers-only)
+S:     Maintained
+
 AX.25 NETWORK LAYER
 P:     Ralf Baechle
 M:     [email protected]
@@ -780,7 +784,7 @@ DVB SUBSYSTEM AND DRIVERS
 P:     LinuxTV.org Project
 M:     [email protected]
 L:     [email protected] (subscription required)
-W:     http://linuxtv.org/developer/dvb.xml
+W:     http://linuxtv.org/
 S:     Supported
 
 EATA-DMA SCSI DRIVER
@@ -1165,6 +1169,12 @@ L:       [email protected]
 L:     [email protected]
 S:     Maintained
 
+INOTIFY
+P:     John McCutchan and Robert Love
+M:     [email protected] and [email protected]
+L:     [email protected]
+S:     Maintained
+
 INTEL 810/815 FRAMEBUFFER DRIVER
 P:      Antonino Daplas
 M:      [email protected]
@@ -1236,7 +1246,7 @@ S:        Maintained
 
 IRDA SUBSYSTEM
 P:     Jean Tourrilhes
-L:     [email protected]
+L:     [email protected] (subscribers-only)
 W:     http://irda.sourceforge.net/
 S:     Maintained
 
@@ -1406,13 +1416,20 @@ W:      http://www.penguinppc.org/
 L:     [email protected]
 S:     Maintained
 
-LINUX FOR POWERPC EMBEDDED PPC8XX AND BOOT CODE
+LINUX FOR POWERPC BOOT CODE
 P:     Tom Rini
 M:     [email protected]
 W:     http://www.penguinppc.org/
 L:     [email protected]
 S:     Maintained
 
+LINUX FOR POWERPC EMBEDDED PPC8XX
+P:     Marcelo Tosatti
+M:     [email protected]
+W:     http://www.penguinppc.org/
+L:     [email protected]
+S:     Maintained
+
 LINUX FOR POWERPC EMBEDDED PPC83XX AND PPC85XX
 P:     Kumar Gala
 M:     [email protected]
@@ -1504,6 +1521,12 @@ P:       Zach Brown
 M:     [email protected]
 S:     Odd Fixes
 
+MAN-PAGES: MANUAL PAGES FOR LINUX -- Sections 2, 3, 4, 5, and 7
+P: Michael Kerrisk
+M: [email protected]
+W: ftp://ftp.kernel.org/pub/linux/docs/manpages
+S: Maintained
+
 MARVELL MV64340 ETHERNET DRIVER
 P:     Manish Lachwani
 M:     [email protected]
@@ -1635,7 +1658,7 @@ M:        [email protected]
 P:     Pekka Savola (ipv6)
 M:     [email protected]
 P:     James Morris
-M:     jmorris@redhat.com
+M:     jmorris@namei.org
 P:     Hideaki YOSHIFUJI
 M:     [email protected]
 P:     Patrick McHardy
@@ -1716,7 +1739,7 @@ S:        Maintained
 
 OPL3-SA2, SA3, and SAx DRIVER
 P:     Zwane Mwaikambo
-M:     zwane@commfireservices.com
+M:     zwane@arm.linux.org.uk
 L:     [email protected]
 S:     Maintained
 
@@ -1802,9 +1825,16 @@ P:       Greg Kroah-Hartman
 M:     [email protected]
 S:     Maintained
 
+PCIE HOTPLUG DRIVER
+P:     Kristen Carlson Accardi
+M:     [email protected]
+L:     [email protected]
+S:     Maintained
+
 PCMCIA SUBSYSTEM
+P:     Linux PCMCIA Team
 L:     http://lists.infradead.org/mailman/listinfo/linux-pcmcia
-S:     Unmaintained
+S:     Maintained
 
 PCNET32 NETWORK DRIVER
 P:     Thomas Bogendörfer
@@ -1965,7 +1995,7 @@ S:        Maintained
 
 SC1200 WDT DRIVER
 P:     Zwane Mwaikambo
-M:     zwane@commfireservices.com
+M:     zwane@arm.linux.org.uk
 S:     Maintained
 
 SCHEDULER
@@ -2023,7 +2053,7 @@ SELINUX SECURITY MODULE
 P:     Stephen Smalley
 M:     [email protected]
 P:     James Morris
-M:     jmorris@redhat.com
+M:     jmorris@namei.org
 L:     [email protected] (kernel issues)
 L:     [email protected] (general discussion)
 W:     http://www.nsa.gov/selinux
@@ -2161,7 +2191,7 @@ UltraSPARC (sparc64):
 P:     David S. Miller
 M:     [email protected]
 P:     Eddie C. Dost
-M:     ecd@skynet.be
+M:     ecd@brainaid.de
 P:     Jakub Jelinek
 M:     [email protected]
 P:     Anton Blanchard
@@ -2177,6 +2207,12 @@ W:       http://projects.buici.com/arm
 L:     [email protected] (subscribers-only)
 S:     Maintained
 
+SHPC HOTPLUG DRIVER
+P:     Kristen Carlson Accardi
+M:     [email protected]
+L:     [email protected]
+S:     Maintained
+
 SPARC (sparc32):
 P:     William L. Irwin
 M:     [email protected]
@@ -2415,6 +2451,12 @@ L:       [email protected]
 L:     [email protected]
 S:     Maintained
 
+USB OPTION-CARD DRIVER
+P:     Matthias Urlichs
+M:     [email protected]
+L:     [email protected]
+S:     Maintained
+
 USB OV511 DRIVER
 P:     Mark McClelland
 M:     [email protected]