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