summaryrefslogtreecommitdiff
path: root/MAINTAINERS
diff options
context:
space:
mode:
authorJeff Garzik <jeff@garzik.org>2006-03-22 00:40:51 +0300
committerJeff Garzik <jeff@garzik.org>2006-03-22 00:40:51 +0300
commitca94f26d2b2ee8ad76be617b35f846444fedc07b (patch)
treee26e265fb2a551caebc1f0d7807a1239e669fe0f /MAINTAINERS
parent0b5bf225c06e62eb6066fc5b7ccf4f296356c503 (diff)
parent55be062d2d6397e6f24f3b91608917e9e84206d7 (diff)
downloadlinux-ca94f26d2b2ee8ad76be617b35f846444fedc07b.tar.xz
Merge branch 'e1000-fixes' of git://198.78.49.142/~jbrandeb/linux-2.6
Diffstat (limited to 'MAINTAINERS')
-rw-r--r--MAINTAINERS16
1 files changed, 10 insertions, 6 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index 7a1cbda8a2fe..ebef0ae90e2e 100644
--- 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
-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
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