Au1200: IDE driver build fix

[linux.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index 558636e3a954efc69bb6e8dfe3e5557b0a626ef9..90dcbbcad91c8541326d7179e7bc313880b8bf10 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -163,6 +163,12 @@ M: [email protected]
 L:     [email protected]
 S:     Maintained
 
+AFS FILESYSTEM & AF_RXRPC SOCKET DOMAIN
+P:     David Howells
+M:     [email protected]
+L:     [email protected]
+S:     Supported
+
 AIO
 P:     Benjamin LaHaise
 M:     [email protected]
@@ -266,6 +272,15 @@ L:      [email protected]
 W:      http://www.lesswatts.org/projects/acpi/
 S:      Maintained
 
+AD1889 ALSA SOUND DRIVER
+P:     Kyle McMartin
+M:     [email protected]
+P:     Thibaut Varene
+M:     [email protected]
+W:     http://wiki.parisc-linux.org/AD1889
+L:     [email protected]
+S:     Maintained
+
 ADM1025 HARDWARE MONITOR DRIVER
 P:     Jean Delvare
 M:     [email protected]
@@ -443,7 +458,7 @@ S:  Maintained
 
 ARM/ATMEL AT91RM9200 ARM ARCHITECTURE
 P:      Andrew Victor
-M:      [email protected]
+M:      [email protected]
 L:      [email protected] (subscribers-only)
 W:      http://maxim.org.za/at91_26.html
 S:      Maintained
@@ -871,7 +886,7 @@ P:  Marcel Holtmann
 M:     [email protected]
 P:     Maxim Krasnyansky
 M:     [email protected]
-L:     [email protected]
+L:     [email protected]
 W:     http://bluez.sf.net
 W:     http://www.bluez.org
 W:     http://www.holtmann.org/linux/bluetooth/
@@ -2052,43 +2067,19 @@ M:      [email protected]
 L:     [email protected]
 S:     Maintained
 
-INTEL PRO/100 ETHERNET SUPPORT
+INTEL ETHERNET DRIVERS (e100/e1000/e1000e/igb/ixgb/ixgbe)
 P:     Auke Kok
 M:     [email protected]
 P:     Jesse Brandeburg
 M:     [email protected]
 P:     Jeff Kirsher
 M:     [email protected]
+P:     Bruce Allan
+M:     [email protected]
 P:     John Ronciak
 M:     [email protected]
 L:     [email protected]
-W:     http://sourceforge.net/projects/e1000/
-S:     Supported
-
-INTEL PRO/1000 GIGABIT ETHERNET SUPPORT
-P:     Auke Kok
-M:     [email protected]
-P:     Jesse Brandeburg
-M:     [email protected]
-P:     Jeff Kirsher
-M:     [email protected]
-P:     John Ronciak
-M:     [email protected]
-L:     [email protected]
-W:     http://sourceforge.net/projects/e1000/
-S:     Supported
-
-INTEL PRO/10GbE SUPPORT
-P:     Ayyappan Veeraiyan
-M:     [email protected]
-P:     Auke Kok
-M:     [email protected]
-P:     Jesse Brandeburg
-M:     [email protected]
-P:     John Ronciak
-M:     [email protected]
-L:     [email protected]
-W:     http://sourceforge.net/projects/e1000/
+W:     http://e1000.sourceforge.net/
 S:     Supported
 
 INTEL PRO/WIRELESS 2100 NETWORK CONNECTION SUPPORT
@@ -2125,7 +2116,7 @@ M:        [email protected]
 L:     [email protected]
 L:     [email protected]
 W:     http://intellinuxwireless.org
-T:     git git://intellinuxwireless.org/repos/iwlwifi
+T:     git git://git.kernel.org/pub/scm/linux/kernel/git/rchatre/iwlwifi-2.6.git
 S:     Supported
 
 IOC3 ETHERNET DRIVER
@@ -2156,7 +2147,7 @@ L:        [email protected]
 S:     Maintained
 
 IPATH DRIVER:
-P:     Arthur Jones
+P:     Ralph Campbell
 M:     [email protected]
 L:     [email protected]
 T:     git git://git.qlogic.com/ipath-linux-2.6
@@ -2329,14 +2320,14 @@ L:      [email protected]
 S:     Maintained
 
 KPROBES
-P:     Prasanna S Panchamukhi
-M:     [email protected]
 P:     Ananth N Mavinakayanahalli
 M:     [email protected]
 P:     Anil S Keshavamurthy
 M:     [email protected]
 P:     David S. Miller
 M:     [email protected]
+P:     Masami Hiramatsu
+M:     [email protected]
 L:     [email protected]
 S:     Maintained
 
@@ -2950,9 +2941,9 @@ S:        Maintained
 
 ORACLE CLUSTER FILESYSTEM 2 (OCFS2)
 P:     Mark Fasheh
-M:     mark.fasheh@oracle.com
-P:     Kurt Hackel
-M:     kurt.hackel@oracle.com
+M:     mfasheh@suse.com
+P:     Joel Becker
+M:     joel.becker@oracle.com
 L:     [email protected]
 W:     http://oss.oracle.com/projects/ocfs2/
 S:     Supported