diff options
| author |   Steven Whitehouse <swhiteho@redhat.com> | 2006-06-20 11:19:40 -0400 |
|---|---|---|
| committer | Steven Whitehouse <swhiteho@redhat.com> | 2006-06-20 11:19:40 -0400 |
| commit | d636b2798732f2cfba48d94aa19b7ba206268a83 (patch) | |
| tree | 40dc52126ab5a1570a000321d93ca4bb03312684 /MAINTAINERS | |
| parent | [DLM] Fix potential conflict in DLM userland locks (diff) | |
| parent | Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus (diff) | |
| download | linux-dev-d636b2798732f2cfba48d94aa19b7ba206268a83.tar.xz linux-dev-d636b2798732f2cfba48d94aa19b7ba206268a83.zip | |
Merge branch 'master'
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 6 |
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 |