David S. Miller b633353115 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: drivers/net/phy/bcm7xxx.c drivers/net/phy/marvell.c drivers/net/vxlan.c All three conflicts were cases of simple overlapping changes. Signed-off-by: David S. Miller <davem@davemloft.net>		2016-02-23 00:09:14 -05:00
..
hyperv_net.h	hv_netvsc: Fix book keeping of skb during batching process	2016-01-25 10:51:53 -08:00
Kconfig
Makefile
netvsc_drv.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2016-02-23 00:09:14 -05:00
netvsc.c	hv_netvsc: Fix book keeping of skb during batching process	2016-01-25 10:51:53 -08:00
rndis_filter.c	hv_netvsc: Eliminate vlan_tci from struct hv_netvsc_packet	2015-12-02 23:43:25 -05:00