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