/home/lenb/src/to-akpm branch 'acpi-2.6.12'

[linux.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index 4db63de9652a31ca8c83a25d562cacd8329072f4..c31ddc4bcdd620555d2d5134d94109d16605b7b3 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]
@@ -512,11 +516,11 @@ W:        http://linuxppc64.org
 S:     Supported
 
 BTTV VIDEO4LINUX DRIVER
-P:     Gerd Knorr
-M:     [email protected]
+P:     Mauro Carvalho Chehab
+M:     [email protected]
 L:     [email protected]
-W:     http://bytesex.org/bttv/
-S:     Orphan
+W:     http://linuxtv.org
+S:     Maintained
 
 BUSLOGIC SCSI DRIVER
 P:     Leonard N. Zubkoff
@@ -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]
@@ -1803,8 +1826,9 @@ M:        [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
@@ -2161,7 +2185,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
@@ -2415,6 +2439,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]
@@ -2625,10 +2655,11 @@ W:      http://rio500.sourceforge.net
 S:     Maintained
 
 VIDEO FOR LINUX
-P:     Gerd Knorr
-M:     [email protected]
+P:     Mauro Carvalho Chehab
+M:     [email protected]
 L:     [email protected]
-S:     Orphan
+W:     http://linuxtv.org
+S:     Maintained
 
 W1 DALLAS'S 1-WIRE BUS
 P:     Evgeniy Polyakov