aboutsummaryrefslogtreecommitdiffstats
path: root/MAINTAINERS
diff options
context:
space:
mode:
Diffstat (limited to 'MAINTAINERS')
-rw-r--r--MAINTAINERS10
1 files changed, 5 insertions, 5 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index d5b0b1b6dc52..abd0a77c19fd 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
@@ -3002,10 +3003,9 @@ F: net/ipv4/netfilter/ipt_MASQUERADE.c
3002IP1000A 10/100/1000 GIGABIT ETHERNET DRIVER 3003IP1000A 10/100/1000 GIGABIT ETHERNET DRIVER
3003M: Francois Romieu <romieu@fr.zoreil.com> 3004M: Francois Romieu <romieu@fr.zoreil.com>
3004M: Sorbica Shieh <sorbica@icplus.com.tw> 3005M: Sorbica Shieh <sorbica@icplus.com.tw>
3005M: Jesse Huang <jesse@icplus.com.tw>
3006L: netdev@vger.kernel.org 3006L: netdev@vger.kernel.org
3007S: Maintained 3007S: Maintained
3008F: drivers/net/ipg.c 3008F: drivers/net/ipg.*
3009 3009
3010IPATH DRIVER 3010IPATH DRIVER
3011M: Ralph Campbell <infinipath@qlogic.com> 3011M: Ralph Campbell <infinipath@qlogic.com>
@@ -3852,7 +3852,6 @@ M: Ramkrishna Vepa <ram.vepa@neterion.com>
3852M: Rastapur Santosh <santosh.rastapur@neterion.com> 3852M: Rastapur Santosh <santosh.rastapur@neterion.com>
3853M: Sivakumar Subramani <sivakumar.subramani@neterion.com> 3853M: Sivakumar Subramani <sivakumar.subramani@neterion.com>
3854M: Sreenivasa Honnur <sreenivasa.honnur@neterion.com> 3854M: Sreenivasa Honnur <sreenivasa.honnur@neterion.com>
3855M: Anil Murthy <anil.murthy@neterion.com>
3856L: netdev@vger.kernel.org 3855L: netdev@vger.kernel.org
3857W: http://trac.neterion.com/cgi-bin/trac.cgi/wiki/Linux?Anonymous 3856W: http://trac.neterion.com/cgi-bin/trac.cgi/wiki/Linux?Anonymous
3858W: http://trac.neterion.com/cgi-bin/trac.cgi/wiki/X3100Linux?Anonymous 3857W: http://trac.neterion.com/cgi-bin/trac.cgi/wiki/X3100Linux?Anonymous
@@ -3957,6 +3956,7 @@ F: net/rfkill/
3957F: net/wireless/ 3956F: net/wireless/
3958F: include/net/ieee80211* 3957F: include/net/ieee80211*
3959F: include/linux/wireless.h 3958F: include/linux/wireless.h
3959F: include/linux/iw_handler.h
3960F: drivers/net/wireless/ 3960F: drivers/net/wireless/
3961 3961
3962NETWORKING DRIVERS 3962NETWORKING DRIVERS