David S. Miller 1e8d6421cf Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: drivers/net/bonding/bond_3ad.h drivers/net/bonding/bond_main.c Two minor conflicts in bonding, both of which were overlapping changes. Signed-off-by: David S. Miller <davem@davemloft.net>		2014-02-19 01:24:22 -05:00
..
hyperv_net.h	Drivers: net: hyperv: Cleanup the netvsc receive callback functio	2014-02-17 16:32:32 -05:00
Kconfig
Makefile
netvsc.c	Drivers: net: hyperv: Cleanup the netvsc receive callback functio	2014-02-17 16:32:32 -05:00
netvsc_drv.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2014-02-19 01:24:22 -05:00
rndis_filter.c	Drivers: net: hyperv: Get rid of the rndis_filter_packet structure	2014-02-17 16:32:31 -05:00