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 | 9f5aa2a921797ce6eb4542c7517915bd1d5fbd0b (diff) | |
parent | 25f42b6af09e34c3f92107b36b5aa6edc2fdba2f (diff) |
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 | |||
1443 | M: jesse.brandeburg@intel.com | 1443 | M: jesse.brandeburg@intel.com |
1444 | P: Jeff Kirsher | 1444 | P: Jeff Kirsher |
1445 | M: jeffrey.t.kirsher@intel.com | 1445 | M: jeffrey.t.kirsher@intel.com |
1446 | P: Auke Kok | ||
1447 | M: auke-jan.h.kok@intel.com | ||
1446 | W: http://sourceforge.net/projects/e1000/ | 1448 | W: http://sourceforge.net/projects/e1000/ |
1447 | S: Supported | 1449 | S: Supported |
1448 | 1450 | ||
@@ -1455,6 +1457,8 @@ P: Jesse Brandeburg | |||
1455 | M: jesse.brandeburg@intel.com | 1457 | M: jesse.brandeburg@intel.com |
1456 | P: Jeff Kirsher | 1458 | P: Jeff Kirsher |
1457 | M: jeffrey.t.kirsher@intel.com | 1459 | M: jeffrey.t.kirsher@intel.com |
1460 | P: Auke Kok | ||
1461 | M: auke-jan.h.kok@intel.com | ||
1458 | W: http://sourceforge.net/projects/e1000/ | 1462 | W: http://sourceforge.net/projects/e1000/ |
1459 | S: Supported | 1463 | S: Supported |
1460 | 1464 | ||
@@ -1467,6 +1471,8 @@ P: John Ronciak | |||
1467 | M: john.ronciak@intel.com | 1471 | M: john.ronciak@intel.com |
1468 | P: Jesse Brandeburg | 1472 | P: Jesse Brandeburg |
1469 | M: jesse.brandeburg@intel.com | 1473 | M: jesse.brandeburg@intel.com |
1474 | P: Auke Kok | ||
1475 | M: auke-jan.h.kok@intel.com | ||
1470 | W: http://sourceforge.net/projects/e1000/ | 1476 | W: http://sourceforge.net/projects/e1000/ |
1471 | S: Supported | 1477 | S: Supported |
1472 | 1478 | ||