summaryrefslogtreecommitdiffstats
path: root/MAINTAINERS
diff options
context:
space:
mode:
authorSteven Whitehouse <swhiteho@redhat.com>2006-06-20 11:19:40 -0400
committerSteven Whitehouse <swhiteho@redhat.com>2006-06-20 11:19:40 -0400
commitd636b2798732f2cfba48d94aa19b7ba206268a83 (patch)
tree40dc52126ab5a1570a000321d93ca4bb03312684 /MAINTAINERS
parent9f5aa2a921797ce6eb4542c7517915bd1d5fbd0b (diff)
parent25f42b6af09e34c3f92107b36b5aa6edc2fdba2f (diff)
downloadlinux-stable-d636b2798732f2cfba48d94aa19b7ba206268a83.tar.gz
linux-stable-d636b2798732f2cfba48d94aa19b7ba206268a83.tar.bz2
linux-stable-d636b2798732f2cfba48d94aa19b7ba206268a83.zip
Merge branch 'master'
Diffstat (limited to 'MAINTAINERS')
-rw-r--r--MAINTAINERS6
1 files changed, 6 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index e593acee2a11..50817bf60694 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1443,6 +1443,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
@@ -1455,6 +1457,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
@@ -1467,6 +1471,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