David S. Miller 101c431492 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: drivers/net/ethernet/broadcom/genet/bcmgenet.c net/core/sock.c Conflicts were overlapping changes in bcmgenet and the lockdep handling of sockets. Signed-off-by: David S. Miller <davem@davemloft.net>		2017-03-15 11:59:10 -07:00
..
hyperv_net.h	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2017-03-15 11:59:10 -07:00
Kconfig
Makefile
netvsc_drv.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2017-03-15 11:59:10 -07:00
netvsc.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2017-03-15 11:59:10 -07:00
rndis_filter.c	netvsc: implement NAPI	2017-03-06 17:13:13 -08:00