diff options
| author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2006-06-20 08:59:45 -0400 |
|---|---|---|
| committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2006-06-20 08:59:45 -0400 |
| commit | d59bf96cdde5b874a57bfd1425faa45da915d0b7 (patch) | |
| tree | 351a40b72514d620e5bebea2de38c26f23277ffc /MAINTAINERS | |
| parent | 28df955a2ad484d602314b30183ea8496a9aa34a (diff) | |
| parent | 25f42b6af09e34c3f92107b36b5aa6edc2fdba2f (diff) | |
Merge branch 'master' of /home/trondmy/kernel/linux-2.6/
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index c3c5842402df..1421f74b6009 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
| @@ -1425,6 +1425,8 @@ P: Jesse Brandeburg | |||
| 1425 | M: jesse.brandeburg@intel.com | 1425 | M: jesse.brandeburg@intel.com |
| 1426 | P: Jeff Kirsher | 1426 | P: Jeff Kirsher |
| 1427 | M: jeffrey.t.kirsher@intel.com | 1427 | M: jeffrey.t.kirsher@intel.com |
| 1428 | P: Auke Kok | ||
| 1429 | M: auke-jan.h.kok@intel.com | ||
| 1428 | W: http://sourceforge.net/projects/e1000/ | 1430 | W: http://sourceforge.net/projects/e1000/ |
| 1429 | S: Supported | 1431 | S: Supported |
| 1430 | 1432 | ||
| @@ -1437,6 +1439,8 @@ P: Jesse Brandeburg | |||
| 1437 | M: jesse.brandeburg@intel.com | 1439 | M: jesse.brandeburg@intel.com |
| 1438 | P: Jeff Kirsher | 1440 | P: Jeff Kirsher |
| 1439 | M: jeffrey.t.kirsher@intel.com | 1441 | M: jeffrey.t.kirsher@intel.com |
| 1442 | P: Auke Kok | ||
| 1443 | M: auke-jan.h.kok@intel.com | ||
| 1440 | W: http://sourceforge.net/projects/e1000/ | 1444 | W: http://sourceforge.net/projects/e1000/ |
| 1441 | S: Supported | 1445 | S: Supported |
| 1442 | 1446 | ||
| @@ -1449,6 +1453,8 @@ P: John Ronciak | |||
| 1449 | M: john.ronciak@intel.com | 1453 | M: john.ronciak@intel.com |
| 1450 | P: Jesse Brandeburg | 1454 | P: Jesse Brandeburg |
| 1451 | M: jesse.brandeburg@intel.com | 1455 | M: jesse.brandeburg@intel.com |
| 1456 | P: Auke Kok | ||
| 1457 | M: auke-jan.h.kok@intel.com | ||
| 1452 | W: http://sourceforge.net/projects/e1000/ | 1458 | W: http://sourceforge.net/projects/e1000/ |
| 1453 | S: Supported | 1459 | S: Supported |
| 1454 | 1460 | ||