MAINTAINERS: Remove Glenn Streiff from NetEffect entry

[linux-2.6.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index c16b986d7e0a859cbeafc57438cd4644bfa82b56..2a73da0cd075b464c26c42a577fbbbe20d8dd224 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -216,8 +216,8 @@ W:  http://code.google.com/p/aceracpi
 S:     Maintained
 
 ACPI
-P:     Len Brown
-M:     len.brown@intel.com
+P:     Andi Kleen
+M:     ak@linux.intel.com
 M:     lenb@kernel.org
 L:     linux-acpi@vger.kernel.org
 W:     http://www.lesswatts.org/projects/acpi/
@@ -239,8 +239,8 @@ W:  http://www.lesswatts.org/projects/acpi/
 S:     Supported
 
 ACPI FAN DRIVER
-P:     Len Brown
-M:     len.brown@intel.com
+P:     Zhang Rui
+M:     rui.zhang@intel.com
 L:     linux-acpi@vger.kernel.org
 W:     http://www.lesswatts.org/projects/acpi/
 S:     Supported
@@ -248,18 +248,18 @@ S:        Supported
 ACPI PCI HOTPLUG DRIVER
 P:     Kristen Carlson Accardi
 M:     kristen.c.accardi@intel.com
-L:     pcihpd-discuss@lists.sourceforge.net
+L:     linux-pci@vger.kernel.org
 S:     Supported
 
 ACPI THERMAL DRIVER
-P:     Len Brown
-M:     len.brown@intel.com
+P:     Zhang Rui
+M:     rui.zhang@intel.com
 L:     linux-acpi@vger.kernel.org
 W:     http://www.lesswatts.org/projects/acpi/
 S:     Supported
 
 ACPI VIDEO DRIVER
-P:     Rui Zhang
+P:     Zhang Rui
 M:     rui.zhang@intel.com
 L:     linux-acpi@vger.kernel.org
 W:     http://www.lesswatts.org/projects/acpi/
@@ -1145,23 +1145,28 @@ COMPACTPCI HOTPLUG CORE
 P:     Scott Murray
 M:     scottm@somanetworks.com
 M:     scott@spiteful.org
-L:     pcihpd-discuss@lists.sourceforge.net
+L:     linux-pci@vger.kernel.org
 S:     Supported
 
 COMPACTPCI HOTPLUG ZIATECH ZT5550 DRIVER
 P:     Scott Murray
 M:     scottm@somanetworks.com
 M:     scott@spiteful.org
-L:     pcihpd-discuss@lists.sourceforge.net
+L:     linux-pci@vger.kernel.org
 S:     Supported
 
 COMPACTPCI HOTPLUG GENERIC DRIVER
 P:     Scott Murray
 M:     scottm@somanetworks.com
 M:     scott@spiteful.org
-L:     pcihpd-discuss@lists.sourceforge.net
+L:     linux-pci@vger.kernel.org
 S:     Supported
 
+COMPAL LAPTOP SUPPORT
+P:     Cezary Jackiewicz
+M:     cezary.jackiewicz@gmail.com
+S:     Maintained
+
 COMPUTONE INTELLIPORT MULTIPORT CARD
 P:     Michael H. Warfield
 M:     mhw@wittsend.com
@@ -1688,6 +1693,13 @@ L:       linuxppc-embedded@ozlabs.org
 L:     linux-kernel@vger.kernel.org
 S:     Maintained
 
+FREESCALE I2C CPM DRIVER
+P:     Jochen Friedrich
+M:     jochen@scram.de
+L:     linuxppc-dev@ozlabs.org
+L:     i2c@lm-sensors.org
+S:     Maintained
+
 FREESCALE SOC FS_ENET DRIVER
 P:     Pantelis Antoniou
 M:     pantelis.antoniou@gmail.com
@@ -1772,11 +1784,22 @@ M:      hch@infradead.org
 W:     ftp://ftp.openlinux.org/pub/people/hch/vxfs
 S:     Maintained
 
+FTRACE
+P:     Steven Rostedt
+M:     srostedt@redhat.com
+S:     Maintained
+
 FUJITSU FR-V (FRV) PORT
 P:     David Howells
 M:     dhowells@redhat.com
 S:     Maintained
 
+FUJITSU LAPTOP EXTRAS
+P:     Jonathan Woithe
+M:     jwoithe@physics.adelaide.edu.au
+L:     linux-acpi@vger.kernel.org
+S:     Maintained
+
 FUSE: FILESYSTEM IN USERSPACE
 P:     Miklos Szeredi
 M:     miklos@szeredi.hu
@@ -1965,6 +1988,12 @@ M:       mikulas@artax.karlin.mff.cuni.cz
 W:     http://artax.karlin.mff.cuni.cz/~mikulas/vyplody/hpfs/index-e.cgi
 S:     Maintained
 
+HTCPEN TOUCHSCREEN DRIVER
+P:     Pau Oliva Fora
+M:     pof@eslack.org
+L:     linux-input@vger.kernel.org
+S:     Maintained
+
 HUGETLB FILESYSTEM
 P:     William Irwin
 M:     wli@holomorphy.com
@@ -2166,6 +2195,8 @@ P:        Jesse Brandeburg
 M:     jesse.brandeburg@intel.com
 P:     Bruce Allan
 M:     bruce.w.allan@intel.com
+P:     PJ Waskiewicz
+M:     peter.p.waskiewicz.jr@intel.com
 P:     John Ronciak
 M:     john.ronciak@intel.com
 L:     e1000-devel@lists.sourceforge.net
@@ -2315,6 +2346,16 @@ L:       linux-mtd@lists.infradead.org
 W:     http://www.linux-mtd.infradead.org/doc/jffs2.html
 S:     Maintained
 
+UBI FILE SYSTEM (UBIFS)
+P:     Artem Bityutskiy
+M:     dedekind@infradead.org
+P:     Adrian Hunter
+M:     ext-adrian.hunter@nokia.com
+L:     linux-mtd@lists.infradead.org
+T:     git git://git.infradead.org/~dedekind/ubifs-2.6.git
+W:     http://www.linux-mtd.infradead.org/doc/ubifs.html
+S:     Maintained
+
 JFS FILESYSTEM
 P:     Dave Kleikamp
 M:     shaggy@austin.ibm.com
@@ -2511,13 +2552,11 @@ W:      http://www.penguinppc.org/
 L:     linuxppc-dev@ozlabs.org
 S:     Maintained
 
-LINUX FOR POWERPC EMBEDDED MPC52XX
+LINUX FOR POWERPC EMBEDDED MPC5XXX
 P:     Sylvain Munaut
 M:     tnt@246tNt.com
 P:     Grant Likely
 M:     grant.likely@secretlab.ca
-W:     http://www.246tNt.com/mpc52xx/
-W:     http://www.penguinppc.org/
 L:     linuxppc-dev@ozlabs.org
 S:     Maintained
 
@@ -2694,12 +2733,10 @@ L:      libertas-dev@lists.infradead.org
 S:     Maintained
 
 MARVELL MV643XX ETHERNET DRIVER
-P:     Dale Farnsworth
-M:     dale@farnsworth.org
-P:     Manish Lachwani
-M:     mlachwani@mvista.com
+P:     Lennert Buytenhek
+M:     buytenh@marvell.com
 L:     netdev@vger.kernel.org
-S:     Odd Fixes for 2.4; Maintained for 2.6.
+S:     Supported
 
 MATROX FRAMEBUFFER DRIVER
 P:     Petr Vandrovec
@@ -2878,8 +2915,6 @@ P:        Faisal Latif
 M:     flatif@neteffect.com
 P:     Chien Tung
 M:     ctung@neteffect.com
-P:     Glenn Streiff
-M:     gstreiff@neteffect.com
 L:     general@lists.openfabrics.org
 W:     http://www.neteffect.com
 S:     Supported
@@ -3188,7 +3223,7 @@ S:        Supported
 PCIE HOTPLUG DRIVER
 P:     Kristen Carlson Accardi
 M:     kristen.c.accardi@intel.com
-L:     pcihpd-discuss@lists.sourceforge.net
+L:     linux-pci@vger.kernel.org
 S:     Supported
 
 PCMCIA SUBSYSTEM
@@ -3243,14 +3278,6 @@ L:       linux-kernel@vger.kernel.org
 T:     git git.infradead.org/battery-2.6.git
 S:     Maintained
 
-POWERPC 4xx EMAC DRIVER
-P:     Eugene Surovegin
-M:     ebs@ebshome.net
-W:     http://kernel.ebshome.net/emac/
-L:     linuxppc-dev@ozlabs.org
-L:     netdev@vger.kernel.org
-S:     Maintained
-
 PNP SUPPORT
 P:     Adam Belay
 M:     ambx1@neo.rr.com
@@ -3834,7 +3861,7 @@ S:        Maintained
 SHPC HOTPLUG DRIVER
 P:     Kristen Carlson Accardi
 M:     kristen.c.accardi@intel.com
-L:     pcihpd-discuss@lists.sourceforge.net
+L:     linux-pci@vger.kernel.org
 S:     Supported
 
 SECURE DIGITAL HOST CONTROLLER INTERFACE DRIVER
@@ -4018,9 +4045,10 @@ W:       http://www.buzzard.org.uk/toshiba/
 S:     Maintained
 
 TPM DEVICE DRIVER
-P:     Debora Velarde
-P:     Rajiv Andrade
-M:     tpmdd-devel@lists.sourceforge.net
+P:     Debora Velarde
+M:     debora@linux.vnet.ibm.com
+P:     Rajiv Andrade
+M:     srajiv@linux.vnet.ibm.com
 W:     http://tpmdd.sourceforge.net
 P:     Marcel Selhorst
 M:     tpm@selhorst.net