diff options
Diffstat (limited to 'MAINTAINERS')
-rw-r--r-- | MAINTAINERS | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 24490426750d..22a49e68c8b9 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
@@ -1521,9 +1521,10 @@ M: Andy Whitcroft <apw@canonical.com> | |||
1521 | S: Supported | 1521 | S: Supported |
1522 | F: scripts/checkpatch.pl | 1522 | F: scripts/checkpatch.pl |
1523 | 1523 | ||
1524 | CISCO 10G ETHERNET DRIVER | 1524 | CISCO VIC ETHERNET NIC DRIVER |
1525 | M: Scott Feldman <scofeldm@cisco.com> | 1525 | M: Scott Feldman <scofeldm@cisco.com> |
1526 | M: Joe Eykholt <jeykholt@cisco.com> | 1526 | M: Vasanthy Kolluri <vkolluri@cisco.com> |
1527 | M: Roopa Prabhu <roprabhu@cisco.com> | ||
1527 | S: Supported | 1528 | S: Supported |
1528 | F: drivers/net/enic/ | 1529 | F: drivers/net/enic/ |
1529 | 1530 | ||
@@ -3044,10 +3045,9 @@ F: net/ipv4/netfilter/ipt_MASQUERADE.c | |||
3044 | IP1000A 10/100/1000 GIGABIT ETHERNET DRIVER | 3045 | IP1000A 10/100/1000 GIGABIT ETHERNET DRIVER |
3045 | M: Francois Romieu <romieu@fr.zoreil.com> | 3046 | M: Francois Romieu <romieu@fr.zoreil.com> |
3046 | M: Sorbica Shieh <sorbica@icplus.com.tw> | 3047 | M: Sorbica Shieh <sorbica@icplus.com.tw> |
3047 | M: Jesse Huang <jesse@icplus.com.tw> | ||
3048 | L: netdev@vger.kernel.org | 3048 | L: netdev@vger.kernel.org |
3049 | S: Maintained | 3049 | S: Maintained |
3050 | F: drivers/net/ipg.c | 3050 | F: drivers/net/ipg.* |
3051 | 3051 | ||
3052 | IPATH DRIVER | 3052 | IPATH DRIVER |
3053 | M: Ralph Campbell <infinipath@qlogic.com> | 3053 | M: Ralph Campbell <infinipath@qlogic.com> |
@@ -3895,7 +3895,6 @@ M: Ramkrishna Vepa <ram.vepa@neterion.com> | |||
3895 | M: Rastapur Santosh <santosh.rastapur@neterion.com> | 3895 | M: Rastapur Santosh <santosh.rastapur@neterion.com> |
3896 | M: Sivakumar Subramani <sivakumar.subramani@neterion.com> | 3896 | M: Sivakumar Subramani <sivakumar.subramani@neterion.com> |
3897 | M: Sreenivasa Honnur <sreenivasa.honnur@neterion.com> | 3897 | M: Sreenivasa Honnur <sreenivasa.honnur@neterion.com> |
3898 | M: Anil Murthy <anil.murthy@neterion.com> | ||
3899 | L: netdev@vger.kernel.org | 3898 | L: netdev@vger.kernel.org |
3900 | W: http://trac.neterion.com/cgi-bin/trac.cgi/wiki/Linux?Anonymous | 3899 | W: http://trac.neterion.com/cgi-bin/trac.cgi/wiki/Linux?Anonymous |
3901 | W: http://trac.neterion.com/cgi-bin/trac.cgi/wiki/X3100Linux?Anonymous | 3900 | W: http://trac.neterion.com/cgi-bin/trac.cgi/wiki/X3100Linux?Anonymous |
@@ -4000,6 +3999,7 @@ F: net/rfkill/ | |||
4000 | F: net/wireless/ | 3999 | F: net/wireless/ |
4001 | F: include/net/ieee80211* | 4000 | F: include/net/ieee80211* |
4002 | F: include/linux/wireless.h | 4001 | F: include/linux/wireless.h |
4002 | F: include/linux/iw_handler.h | ||
4003 | F: drivers/net/wireless/ | 4003 | F: drivers/net/wireless/ |
4004 | 4004 | ||
4005 | NETWORKING DRIVERS | 4005 | NETWORKING DRIVERS |
@@ -4631,6 +4631,7 @@ F: drivers/net/qla3xxx.* | |||
4631 | 4631 | ||
4632 | QLOGIC QLCNIC (1/10)Gb ETHERNET DRIVER | 4632 | QLOGIC QLCNIC (1/10)Gb ETHERNET DRIVER |
4633 | M: Amit Kumar Salecha <amit.salecha@qlogic.com> | 4633 | M: Amit Kumar Salecha <amit.salecha@qlogic.com> |
4634 | M: Anirban Chakraborty <anirban.chakraborty@qlogic.com> | ||
4634 | M: linux-driver@qlogic.com | 4635 | M: linux-driver@qlogic.com |
4635 | L: netdev@vger.kernel.org | 4636 | L: netdev@vger.kernel.org |
4636 | S: Supported | 4637 | S: Supported |