David S. Miller 143c905494 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: drivers/net/ethernet/intel/i40e/i40e_main.c drivers/net/macvtap.c Both minor merge hassles, simple overlapping changes. Signed-off-by: David S. Miller <davem@davemloft.net>		2013-12-18 16:42:06 -05:00
..
Kconfig	staging: hv: move hv_netvsc out of staging area	2011-11-29 16:12:36 +09:00
Makefile	staging: hv: move hv_netvsc out of staging area	2011-11-29 16:12:36 +09:00
hyperv_net.h	drivers/net/*: Fix FSF address in file headers	2013-12-06 12:37:55 -05:00
netvsc.c	drivers/net/*: Fix FSF address in file headers	2013-12-06 12:37:55 -05:00
netvsc_drv.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2013-12-18 16:42:06 -05:00
rndis_filter.c	drivers/net/*: Fix FSF address in file headers	2013-12-06 12:37:55 -05:00