aboutsummaryrefslogtreecommitdiffstats
path: root/MAINTAINERS
diff options
context:
space:
mode:
Diffstat (limited to 'MAINTAINERS')
-rw-r--r--MAINTAINERS9
1 files changed, 4 insertions, 5 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index 9ff6341e43ba..2c569f506498 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1491,9 +1491,10 @@ M: Andy Whitcroft <apw@canonical.com>
1491S: Supported 1491S: Supported
1492F: scripts/checkpatch.pl 1492F: scripts/checkpatch.pl
1493 1493
1494CISCO 10G ETHERNET DRIVER 1494CISCO VIC ETHERNET NIC DRIVER
1495M: Scott Feldman <scofeldm@cisco.com> 1495M: Scott Feldman <scofeldm@cisco.com>
1496M: Joe Eykholt <jeykholt@cisco.com> 1496M: Vasanthy Kolluri <vkolluri@cisco.com>
1497M: Roopa Prabhu <roprabhu@cisco.com>
1497S: Supported 1498S: Supported
1498F: drivers/net/enic/ 1499F: drivers/net/enic/
1499 1500
@@ -2998,10 +2999,9 @@ F: net/ipv4/netfilter/ipt_MASQUERADE.c
2998IP1000A 10/100/1000 GIGABIT ETHERNET DRIVER 2999IP1000A 10/100/1000 GIGABIT ETHERNET DRIVER
2999M: Francois Romieu <romieu@fr.zoreil.com> 3000M: Francois Romieu <romieu@fr.zoreil.com>
3000M: Sorbica Shieh <sorbica@icplus.com.tw> 3001M: Sorbica Shieh <sorbica@icplus.com.tw>
3001M: Jesse Huang <jesse@icplus.com.tw>
3002L: netdev@vger.kernel.org 3002L: netdev@vger.kernel.org
3003S: Maintained 3003S: Maintained
3004F: drivers/net/ipg.c 3004F: drivers/net/ipg.*
3005 3005
3006IPATH DRIVER 3006IPATH DRIVER
3007M: Ralph Campbell <infinipath@qlogic.com> 3007M: Ralph Campbell <infinipath@qlogic.com>
@@ -3838,7 +3838,6 @@ M: Ramkrishna Vepa <ram.vepa@neterion.com>
3838M: Rastapur Santosh <santosh.rastapur@neterion.com> 3838M: Rastapur Santosh <santosh.rastapur@neterion.com>
3839M: Sivakumar Subramani <sivakumar.subramani@neterion.com> 3839M: Sivakumar Subramani <sivakumar.subramani@neterion.com>
3840M: Sreenivasa Honnur <sreenivasa.honnur@neterion.com> 3840M: Sreenivasa Honnur <sreenivasa.honnur@neterion.com>
3841M: Anil Murthy <anil.murthy@neterion.com>
3842L: netdev@vger.kernel.org 3841L: netdev@vger.kernel.org
3843W: http://trac.neterion.com/cgi-bin/trac.cgi/wiki/Linux?Anonymous 3842W: http://trac.neterion.com/cgi-bin/trac.cgi/wiki/Linux?Anonymous
3844W: http://trac.neterion.com/cgi-bin/trac.cgi/wiki/X3100Linux?Anonymous 3843W: http://trac.neterion.com/cgi-bin/trac.cgi/wiki/X3100Linux?Anonymous