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
..
Makefile
upt1_defs.h	vmxnet3: remove set_flag_le{16,64} helpers	2010-10-24 15:52:31 -07:00
vmxnet3_defs.h	vmxnet3: remove set_flag_le{16,64} helpers	2010-10-24 15:52:31 -07:00
vmxnet3_drv.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2014-03-14 22:31:55 -04:00
vmxnet3_ethtool.c	net: vlan: rename NETIF_F_HW_VLAN_* feature flags to NETIF_F_HW_VLAN_CTAG_*	2013-04-19 14:45:26 -04:00
vmxnet3_int.h	drivers/net: delete non-required instances of include <linux/init.h>	2014-01-16 11:53:26 -08:00