David S. Miller 3f3558bb51 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: drivers/net/xen-netfront.c Minor overlapping changes in xen-netfront.c, mostly to do with some buffer management changes alongside the split of stats into TX and RX. Signed-off-by: David S. Miller <davem@davemloft.net>		2015-01-15 00:53:17 -05:00
..
adapter.h	cxgb4vf: Fix ethtool get_settings for VF driver	2014-12-22 16:35:28 -05:00
cxgb4vf_main.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2015-01-15 00:53:17 -05:00
Makefile
sge.c	net: rename vlan_tx_* helpers since "tx" is misleading there	2015-01-13 17:51:08 -05:00
t4vf_common.h	cxgb4vf: Fix ethtool get_settings for VF driver	2014-12-22 16:35:28 -05:00
t4vf_defs.h	cxgb4/cxg4vf/csiostor: Cleanup MC, MA and CIM related register defines	2015-01-05 16:34:47 -05:00
t4vf_hw.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2015-01-15 00:53:17 -05:00