bnx2x: Add TPA, Broadcoms HW LRO

[net-next-2.6.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index a536396a4af1cbc193bea9b6fdd46b2a05f67371..d0ea6ec2552fc4df2ce82a61ab769930ea8b96d7 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -274,7 +274,7 @@ S:      Maintained
 
 AD1889 ALSA SOUND DRIVER
 P:     Kyle McMartin
-M:     kyle@parisc-linux.org
+M:     kyle@mcmartin.ca
 P:     Thibaut Varene
 M:     T-Bone@parisc-linux.org
 W:     http://wiki.parisc-linux.org/AD1889
@@ -1828,7 +1828,7 @@ S:        Maintained
 
 HARMONY SOUND DRIVER
 P:     Kyle McMartin
-M:     kyle@parisc-linux.org
+M:     kyle@mcmartin.ca
 L:     linux-parisc@vger.kernel.org
 S:     Maintained
 
@@ -2147,6 +2147,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
@@ -2690,12 +2692,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
@@ -3121,7 +3121,7 @@ S:        Maintained
 
 PARISC ARCHITECTURE
 P:     Kyle McMartin
-M:     kyle@parisc-linux.org
+M:     kyle@mcmartin.ca
 P:     Matthew Wilcox
 M:     matthew@wil.cx
 P:     Grant Grundler
@@ -3233,14 +3233,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
@@ -4026,7 +4018,7 @@ TULIP NETWORK DRIVERS
 P:     Grant Grundler
 M:     grundler@parisc-linux.org
 P:     Kyle McMartin
-M:     kyle@parisc-linux.org
+M:     kyle@mcmartin.ca
 L:     netdev@vger.kernel.org
 S:     Maintained