David S. Miller 3efa70d78f Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... The conflict was an interaction between a bug fix in the netvsc driver in 'net' and an optimization of the RX path in 'net-next'. Signed-off-by: David S. Miller <davem@davemloft.net>		2017-02-07 16:29:30 -05:00
..
hyperv_net.h	netvsc: report per-channel stats in ethtool statistics	2017-01-24 16:29:01 -05:00
Kconfig
Makefile
netvsc_drv.c	net-next: treewide use is_vlan_dev() helper function.	2017-02-06 16:33:29 -05:00
netvsc.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2017-02-07 16:29:30 -05:00
rndis_filter.c	netvsc: eliminate per-device outstanding send counter	2017-01-24 16:29:01 -05:00