David S. Miller 85dcce7a73 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: drivers/net/usb/r8152.c drivers/net/xen-netback/netback.c Both the r8152 and netback conflicts were simple overlapping changes. Signed-off-by: David S. Miller <davem@davemloft.net>		2014-03-14 22:31:55 -04: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	hyperv: Change the receive buffer size for legacy hosts	2014-03-10 16:11:26 -04:00
netvsc.c	hyperv: Change the receive buffer size for legacy hosts	2014-03-10 16:11:26 -04:00
netvsc_drv.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2014-03-14 22:31:55 -04:00
rndis_filter.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2014-03-14 22:31:55 -04:00