diff options
| author | David S. Miller <davem@davemloft.net> | 2008-05-13 01:09:15 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-05-13 01:09:15 -0700 |
| commit | 47ac3199acb0676b58491b29418283f37a116952 (patch) | |
| tree | 42cbd2efc6aae4c52ce150938142523911a889c5 /MAINTAINERS | |
| parent | 608961a5eca8d3c6bd07172febc27b5559408c5d (diff) | |
| parent | 993245908ec35c071315479e20602577b7b5dde6 (diff) | |
Merge branch 'upstream-davem' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index c3a533d5d38..0cc47b9942b 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -2104,12 +2104,10 @@ L: netdev@vger.kernel.org S: Maintained INTEL ETHERNET DRIVERS (e100/e1000/e1000e/igb/ixgb/ixgbe) -P: Auke Kok -M: auke-jan.h.kok@intel.com -P: Jesse Brandeburg -M: jesse.brandeburg@intel.com P: Jeff Kirsher M: jeffrey.t.kirsher@intel.com +P: Jesse Brandeburg +M: jesse.brandeburg@intel.com P: Bruce Allan M: bruce.w.allan@intel.com P: John Ronciak |