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

[linux.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index 5d014725901c0ea91b4b352211a8dbaf8e806301..c31ddc4bcdd620555d2d5134d94109d16605b7b3 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1169,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]
@@ -1410,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]
@@ -1508,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]
@@ -2420,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]