diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-05-19 12:38:53 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-05-19 12:39:03 +1000 |
| commit | 9f067b46a011a42370a491d370e65600f5675206 (patch) | |
| tree | 25ae19e6fe5fb28e2ca675680005401979eec12f /MAINTAINERS | |
| parent | 9345ed05b3a030aaace986a9b59ef904fd0667cb (diff) | |
| parent | 622ccdf107bcb49c4d8fb65512652566d4c8928a (diff) | |
Merge remote branch 'net/master'
Conflicts:
Documentation/feature-removal-schedule.txt
include/linux/mod_devicetable.h
scripts/mod/file2alias.c
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index e2e747511717..c76834a2d09c 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1515,9 +1515,10 @@ M: Andy Whitcroft <apw@canonical.com> S: Supported F: scripts/checkpatch.pl -CISCO 10G ETHERNET DRIVER +CISCO VIC ETHERNET NIC DRIVER M: Scott Feldman <scofeldm@cisco.com> -M: Joe Eykholt <jeykholt@cisco.com> +M: Vasanthy Kolluri <vkolluri@cisco.com> +M: Roopa Prabhu <roprabhu@cisco.com> S: Supported F: drivers/net/enic/ @@ -3042,10 +3043,9 @@ F: net/ipv4/netfilter/ipt_MASQUERADE.c IP1000A 10/100/1000 GIGABIT ETHERNET DRIVER M: Francois Romieu <romieu@fr.zoreil.com> M: Sorbica Shieh <sorbica@icplus.com.tw> -M: Jesse Huang <jesse@icplus.com.tw> L: netdev@vger.kernel.org S: Maintained -F: drivers/net/ipg.c +F: drivers/net/ipg.* IPATH DRIVER M: Ralph Campbell <infinipath@qlogic.com> @@ -3896,7 +3896,6 @@ M: Ramkrishna Vepa <ram.vepa@neterion.com> M: Rastapur Santosh <santosh.rastapur@neterion.com> M: Sivakumar Subramani <sivakumar.subramani@neterion.com> M: Sreenivasa Honnur <sreenivasa.honnur@neterion.com> -M: Anil Murthy <anil.murthy@neterion.com> L: netdev@vger.kernel.org W: http://trac.neterion.com/cgi-bin/trac.cgi/wiki/Linux?Anonymous W: http://trac.neterion.com/cgi-bin/trac.cgi/wiki/X3100Linux?Anonymous @@ -4001,6 +4000,7 @@ F: net/rfkill/ F: net/wireless/ F: include/net/ieee80211* F: include/linux/wireless.h +F: include/linux/iw_handler.h F: drivers/net/wireless/ NETWORKING DRIVERS |