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