[IA64] prevent sn2 specific code to be run in generic kernels

[net-next-2.6.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index ce3c8f52c9196295e5851930778f2713d81d9d47..11d44daa60259112c104b9109ca7c960ae6fff4d 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -549,6 +549,7 @@ S:  Maintained
 COMMON INTERNET FILE SYSTEM (CIFS)
 P:     Steve French
 M:     sfrench@samba.org
+L:     linux-cifs-client@lists.samba.org
 L:     samba-technical@lists.samba.org
 W:     http://us1.samba.org/samba/Linux_CIFS_client.html
 T:     git kernel.org:/pub/scm/linux/kernel/git/sfrench/cifs-2.6.git
@@ -556,7 +557,8 @@ S:  Supported
 
 CONFIGFS
 P:     Joel Becker
-M:     Joel Becker <joel.becker@oracle.com>
+M:     joel.becker@oracle.com
+L:     linux-kernel@vger.kernel.org
 S:     Supported
 
 CIRRUS LOGIC GENERIC FBDEV DRIVER
@@ -866,6 +868,15 @@ L: ebtables-devel@lists.sourceforge.net
 W:     http://ebtables.sourceforge.net/
 S:     Maintained
 
+EDAC-CORE
+P:      Doug Thompson
+M:      norsk5@xmission.com, dthompson@linuxnetworx.com
+P:      Dave Peterson
+M:      dsp@llnl.gov, dave_peterson@pobox.com
+L:      bluesmoke-devel@lists.sourceforge.net
+W:      bluesmoke.sourceforge.net
+S:      Maintained
+
 EEPRO100 NETWORK DRIVER
 P:     Andrey V. Savochkin
 M:     saw@saw.sw.com.sg
@@ -1166,8 +1177,8 @@ T:        git kernel.org:/pub/scm/linux/kernel/git/aegl/linux-2.6.git
 S:     Maintained
 
 SN-IA64 (Itanium) SUB-PLATFORM
-P:     Greg Edwards
-M:     edwardsg@sgi.com
+P:     Jes Sorensen
+M:     jes@sgi.com
 L:     linux-altix@sgi.com
 L:     linux-ia64@vger.kernel.org
 W:     http://www.sgi.com/altix
@@ -1397,7 +1408,7 @@ IRDA SUBSYSTEM
 P:     Jean Tourrilhes
 L:     irda-users@lists.sourceforge.net (subscribers-only)
 W:     http://irda.sourceforge.net/
-S:     Maintained
+S:     Odd Fixes
 
 ISAPNP
 P:     Jaroslav Kysela
@@ -1695,11 +1706,13 @@ M: mtk-manpages@gmx.net
 W: ftp://ftp.kernel.org/pub/linux/docs/manpages
 S: Maintained
 
-MARVELL MV64340 ETHERNET DRIVER
+MARVELL MV643XX ETHERNET DRIVER
+P:     Dale Farnsworth
+M:     dale@farnsworth.org
 P:     Manish Lachwani
-L:     linux-mips@linux-mips.org
+M:     mlachwani@mvista.com
 L:     netdev@vger.kernel.org
-S:     Supported
+S:     Odd Fixes for 2.4; Maintained for 2.6.
 
 MATROX FRAMEBUFFER DRIVER
 P:     Petr Vandrovec
@@ -1840,7 +1853,14 @@ M:       yoshfuji@linux-ipv6.org
 P:     Patrick McHardy
 M:     kaber@coreworks.de
 L:     netdev@vger.kernel.org
-T:     git kernel.org:/pub/scm/linux/kernel/davem/net-2.6.git
+T:     git kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6.git
+S:     Maintained
+
+NETWORKING [WIRELESS]
+P:     John W. Linville
+M:     linville@tuxdriver.com
+L:     netdev@vger.kernel.org
+T:     git kernel.org:/pub/scm/linux/kernel/git/linville/wireless-2.6.git
 S:     Maintained
 
 IPVS
@@ -1965,7 +1985,6 @@ M:        philb@gnu.org
 P:     Tim Waugh
 M:     tim@cyberelk.net
 P:     David Campbell
-M:     campbell@torque.net
 P:     Andrea Arcangeli
 M:     andrea@suse.de
 L:     linux-parport@lists.infradead.org
@@ -2059,7 +2078,7 @@ S:        Maintained
 POSIX CLOCKS and TIMERS
 P:     George Anzinger
 M:     george@mvista.com
-L:     netdev@vger.kernel.org
+L:     linux-kernel@vger.kernel.org
 S:     Supported
 
 POWERPC 4xx EMAC DRIVER
@@ -2279,7 +2298,7 @@ S:        Supported
 
 SELINUX SECURITY MODULE
 P:     Stephen Smalley
-M:     sds@epoch.ncsc.mil
+M:     sds@tycho.nsa.gov
 P:     James Morris
 M:     jmorris@namei.org
 L:     linux-kernel@vger.kernel.org (kernel issues)
@@ -2533,11 +2552,11 @@ S:     Maintained
 
 TIPC NETWORK LAYER
 P:     Per Liden
-M:     per.liden@nospam.ericsson.com
+M:     per.liden@ericsson.com
 P:     Jon Maloy
-M:     jon.maloy@nospam.ericsson.com
+M:     jon.maloy@ericsson.com
 P:     Allan Stephens
-M:     allan.stephens@nospam.windriver.com
+M:     allan.stephens@windriver.com
 L:     tipc-discussion@lists.sourceforge.net
 W:     http://tipc.sourceforge.net/
 W:     http://tipc.cslab.ericsson.net/
@@ -2654,6 +2673,14 @@ M:       dbrownell@users.sourceforge.net
 L:     linux-usb-devel@lists.sourceforge.net
 S:     Maintained
 
+USB ET61X[12]51 DRIVER
+P:     Luca Risolia
+M:     luca.risolia@studio.unibo.it
+L:     linux-usb-devel@lists.sourceforge.net
+L:     video4linux-list@redhat.com
+W:     http://www.linux-projects.org
+S:     Maintained
+
 USB HID/HIDBP DRIVERS
 P:     Vojtech Pavlik
 M:     vojtech@suse.cz
@@ -2817,6 +2844,7 @@ USB SN9C10x DRIVER
 P:     Luca Risolia
 M:     luca.risolia@studio.unibo.it
 L:     linux-usb-devel@lists.sourceforge.net
+L:     video4linux-list@redhat.com
 W:     http://www.linux-projects.org
 S:     Maintained
 
@@ -2846,6 +2874,7 @@ USB W996[87]CF DRIVER
 P:     Luca Risolia
 M:     luca.risolia@studio.unibo.it
 L:     linux-usb-devel@lists.sourceforge.net
+L:     video4linux-list@redhat.com
 W:     http://www.linux-projects.org
 S:     Maintained