Merge branch 'e1000-fixes' of git://198.78.49.142/~jbrandeb/linux-2.6

ca94f26d · Jeff Garzik · 0b5bf225 · 55be062d · ca94f26d · ca94f26d
Commit ca94f26d authored Mar 21, 2006 by Jeff Garzik
Showing with 502 additions and 292 deletions

Documentation/networking/e100.txt Documentation/networking/e100.txt +97 -61

Documentation/networking/e1000.txt Documentation/networking/e1000.txt +395 -225

MAINTAINERS MAINTAINERS +10 -6

No files found.
--- a/Documentation/networking/e100.txt
+++ b/Documentation/networking/e100.txt
--- a/Documentation/networking/e1000.txt
+++ b/Documentation/networking/e1000.txt
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1349,10 +1349,10 @@ S:	Maintained
 INTEL PRO/100 ETHERNET SUPPORT
 P:	John Ronciak
 M:	john.ronciak@intel.com
-P:	Ganesh Venkatesan
-M:	ganesh.venkatesan@intel.com
 P:	Jesse Brandeburg
 M:	jesse.brandeburg@intel.com
+P:	Jeff Kirsher
+M:	jeffrey.t.kirsher@intel.com
 W:	http://sourceforge.net/projects/e1000/
 S:	Supported
@@ -1361,18 +1361,22 @@ P:	Jeb Cramer
 M:	cramerj@intel.com
 P:	John Ronciak
 M:	john.ronciak@intel.com
-P:	Ganesh Venkatesan
+P:	Jesse Brandeburg
-M:	ganesh.venkatesan@intel.com
+M:	jesse.brandeburg@intel.com
+P:	Jeff Kirsher
+M:	jeffrey.t.kirsher@intel.com
 W:	http://sourceforge.net/projects/e1000/
 S:	Supported
 INTEL PRO/10GbE SUPPORT
+P:	Jeff Kirsher
+M:	jeffrey.t.kirsher@intel.com
 P:	Ayyappan Veeraiyan
 M:	ayyappan.veeraiyan@intel.com
-P:	Ganesh Venkatesan
-M:	ganesh.venkatesan@intel.com
 P:	John Ronciak
 M:	john.ronciak@intel.com
+P:	Jesse Brandeburg
+M:	jesse.brandeburg@intel.com
 W:	http://sourceforge.net/projects/e1000/
 S:	Supported