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