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 3d2651bffadd..b375bf9f4e2c 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
@@ -1501,9 +1501,10 @@ M: Andy Whitcroft <apw@canonical.com> | |||
1501 | S: Supported | 1501 | S: Supported |
1502 | F: scripts/checkpatch.pl | 1502 | F: scripts/checkpatch.pl |
1503 | 1503 | ||
1504 | CISCO 10G ETHERNET DRIVER | 1504 | CISCO VIC ETHERNET NIC DRIVER |
1505 | M: Scott Feldman <scofeldm@cisco.com> | 1505 | M: Scott Feldman <scofeldm@cisco.com> |
1506 | M: Joe Eykholt <jeykholt@cisco.com> | 1506 | M: Vasanthy Kolluri <vkolluri@cisco.com> |
1507 | M: Roopa Prabhu <roprabhu@cisco.com> | ||
1507 | S: Supported | 1508 | S: Supported |
1508 | F: drivers/net/enic/ | 1509 | F: drivers/net/enic/ |
1509 | 1510 | ||
@@ -3013,10 +3014,9 @@ F: net/ipv4/netfilter/ipt_MASQUERADE.c | |||
3013 | IP1000A 10/100/1000 GIGABIT ETHERNET DRIVER | 3014 | IP1000A 10/100/1000 GIGABIT ETHERNET DRIVER |
3014 | M: Francois Romieu <romieu@fr.zoreil.com> | 3015 | M: Francois Romieu <romieu@fr.zoreil.com> |
3015 | M: Sorbica Shieh <sorbica@icplus.com.tw> | 3016 | M: Sorbica Shieh <sorbica@icplus.com.tw> |
3016 | M: Jesse Huang <jesse@icplus.com.tw> | ||
3017 | L: netdev@vger.kernel.org | 3017 | L: netdev@vger.kernel.org |
3018 | S: Maintained | 3018 | S: Maintained |
3019 | F: drivers/net/ipg.c | 3019 | F: drivers/net/ipg.* |
3020 | 3020 | ||
3021 | IPATH DRIVER | 3021 | IPATH DRIVER |
3022 | M: Ralph Campbell <infinipath@qlogic.com> | 3022 | M: Ralph Campbell <infinipath@qlogic.com> |
@@ -3863,7 +3863,6 @@ M: Ramkrishna Vepa <ram.vepa@neterion.com> | |||
3863 | M: Rastapur Santosh <santosh.rastapur@neterion.com> | 3863 | M: Rastapur Santosh <santosh.rastapur@neterion.com> |
3864 | M: Sivakumar Subramani <sivakumar.subramani@neterion.com> | 3864 | M: Sivakumar Subramani <sivakumar.subramani@neterion.com> |
3865 | M: Sreenivasa Honnur <sreenivasa.honnur@neterion.com> | 3865 | M: Sreenivasa Honnur <sreenivasa.honnur@neterion.com> |
3866 | M: Anil Murthy <anil.murthy@neterion.com> | ||
3867 | L: netdev@vger.kernel.org | 3866 | L: netdev@vger.kernel.org |
3868 | W: http://trac.neterion.com/cgi-bin/trac.cgi/wiki/Linux?Anonymous | 3867 | W: http://trac.neterion.com/cgi-bin/trac.cgi/wiki/Linux?Anonymous |
3869 | W: http://trac.neterion.com/cgi-bin/trac.cgi/wiki/X3100Linux?Anonymous | 3868 | W: http://trac.neterion.com/cgi-bin/trac.cgi/wiki/X3100Linux?Anonymous |
@@ -3968,6 +3967,7 @@ F: net/rfkill/ | |||
3968 | F: net/wireless/ | 3967 | F: net/wireless/ |
3969 | F: include/net/ieee80211* | 3968 | F: include/net/ieee80211* |
3970 | F: include/linux/wireless.h | 3969 | F: include/linux/wireless.h |
3970 | F: include/linux/iw_handler.h | ||
3971 | F: drivers/net/wireless/ | 3971 | F: drivers/net/wireless/ |
3972 | 3972 | ||
3973 | NETWORKING DRIVERS | 3973 | NETWORKING DRIVERS |
@@ -4599,6 +4599,7 @@ F: drivers/net/qla3xxx.* | |||
4599 | 4599 | ||
4600 | QLOGIC QLCNIC (1/10)Gb ETHERNET DRIVER | 4600 | QLOGIC QLCNIC (1/10)Gb ETHERNET DRIVER |
4601 | M: Amit Kumar Salecha <amit.salecha@qlogic.com> | 4601 | M: Amit Kumar Salecha <amit.salecha@qlogic.com> |
4602 | M: Anirban Chakraborty <anirban.chakraborty@qlogic.com> | ||
4602 | M: linux-driver@qlogic.com | 4603 | M: linux-driver@qlogic.com |
4603 | L: netdev@vger.kernel.org | 4604 | L: netdev@vger.kernel.org |
4604 | S: Supported | 4605 | S: Supported |