linux/drivers/net/hyperv
David S. Miller 739e4a758e Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
	drivers/net/usb/r8152.c
	net/netfilter/nfnetlink.c

Both r8152 and nfnetlink conflicts were simple overlapping changes.

Signed-off-by: David S. Miller <davem@davemloft.net>
2014-10-02 11:25:43 -07:00
..
hyperv_net.h hyperv: Increase the buffer length for netvsc_channel_cb() 2014-08-22 12:23:09 -07:00
Kconfig
Makefile
netvsc_drv.c hyperv: Fix a bug in netvsc_start_xmit() 2014-09-30 01:21:03 -04:00
netvsc.c hyperv: NULL dereference on error 2014-09-05 17:29:22 -07:00
rndis_filter.c hyperv: Add handler for RNDIS_STATUS_NETWORK_CHANGE event 2014-06-19 21:17:37 -07:00