diff options
author | Jeff Garzik <jeff@garzik.org> | 2006-04-14 23:19:41 -0400 |
---|---|---|
committer | Jeff Garzik <jeff@garzik.org> | 2006-04-14 23:19:41 -0400 |
commit | 8fc65162a8f25929be80c8d6321a3479e92b5aae (patch) | |
tree | cfad5c32408bbdc59a43db16c88f2bea7face7a5 /MAINTAINERS | |
parent | 2acab771b7e676125cb8c96b61dcdefe9ba67e57 (diff) | |
parent | 99a1f9e88694b406b7c334153bacb56adfcf8388 (diff) |
Merge branch '7.0.38-k2' of git://66.93.40.222/srv/git/netdev-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 6d3c401ccdb6..b6dc07f1d63d 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
@@ -1395,6 +1395,8 @@ P: Jesse Brandeburg | |||
1395 | M: jesse.brandeburg@intel.com | 1395 | M: jesse.brandeburg@intel.com |
1396 | P: Jeff Kirsher | 1396 | P: Jeff Kirsher |
1397 | M: jeffrey.t.kirsher@intel.com | 1397 | M: jeffrey.t.kirsher@intel.com |
1398 | P: Auke Kok | ||
1399 | M: auke-jan.h.kok@intel.com | ||
1398 | W: http://sourceforge.net/projects/e1000/ | 1400 | W: http://sourceforge.net/projects/e1000/ |
1399 | S: Supported | 1401 | S: Supported |
1400 | 1402 | ||
@@ -1407,6 +1409,8 @@ P: Jesse Brandeburg | |||
1407 | M: jesse.brandeburg@intel.com | 1409 | M: jesse.brandeburg@intel.com |
1408 | P: Jeff Kirsher | 1410 | P: Jeff Kirsher |
1409 | M: jeffrey.t.kirsher@intel.com | 1411 | M: jeffrey.t.kirsher@intel.com |
1412 | P: Auke Kok | ||
1413 | M: auke-jan.h.kok@intel.com | ||
1410 | W: http://sourceforge.net/projects/e1000/ | 1414 | W: http://sourceforge.net/projects/e1000/ |
1411 | S: Supported | 1415 | S: Supported |
1412 | 1416 | ||
@@ -1419,6 +1423,8 @@ P: John Ronciak | |||
1419 | M: john.ronciak@intel.com | 1423 | M: john.ronciak@intel.com |
1420 | P: Jesse Brandeburg | 1424 | P: Jesse Brandeburg |
1421 | M: jesse.brandeburg@intel.com | 1425 | M: jesse.brandeburg@intel.com |
1426 | P: Auke Kok | ||
1427 | M: auke-jan.h.kok@intel.com | ||
1422 | W: http://sourceforge.net/projects/e1000/ | 1428 | W: http://sourceforge.net/projects/e1000/ |
1423 | S: Supported | 1429 | S: Supported |
1424 | 1430 | ||