summaryrefslogtreecommitdiffstats
path: root/MAINTAINERS
diff options
context:
space:
mode:
authorJeff Garzik <jeff@garzik.org>2006-04-14 23:19:41 -0400
committerJeff Garzik <jeff@garzik.org>2006-04-14 23:19:41 -0400
commit8fc65162a8f25929be80c8d6321a3479e92b5aae (patch)
treecfad5c32408bbdc59a43db16c88f2bea7face7a5 /MAINTAINERS
parent2acab771b7e676125cb8c96b61dcdefe9ba67e57 (diff)
parent99a1f9e88694b406b7c334153bacb56adfcf8388 (diff)
downloadtalos-op-linux-8fc65162a8f25929be80c8d6321a3479e92b5aae.tar.gz
talos-op-linux-8fc65162a8f25929be80c8d6321a3479e92b5aae.zip
Merge branch '7.0.38-k2' of git://66.93.40.222/srv/git/netdev-2.6
Diffstat (limited to 'MAINTAINERS')
-rw-r--r--MAINTAINERS6
1 files changed, 6 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index 6d3c401ccdb6..b6dc07f1d63d 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1395,6 +1395,8 @@ P: Jesse Brandeburg
M: jesse.brandeburg@intel.com
P: Jeff Kirsher
M: jeffrey.t.kirsher@intel.com
+P: Auke Kok
+M: auke-jan.h.kok@intel.com
W: http://sourceforge.net/projects/e1000/
S: Supported
@@ -1407,6 +1409,8 @@ P: Jesse Brandeburg
M: jesse.brandeburg@intel.com
P: Jeff Kirsher
M: jeffrey.t.kirsher@intel.com
+P: Auke Kok
+M: auke-jan.h.kok@intel.com
W: http://sourceforge.net/projects/e1000/
S: Supported
@@ -1419,6 +1423,8 @@ P: John Ronciak
M: john.ronciak@intel.com
P: Jesse Brandeburg
M: jesse.brandeburg@intel.com
+P: Auke Kok
+M: auke-jan.h.kok@intel.com
W: http://sourceforge.net/projects/e1000/
S: Supported
OpenPOWER on IntegriCloud