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
..
e1000	net: rename vlan_tx_* helpers since "tx" is misleading there	2015-01-13 17:51:08 -05:00
e1000e	net: rename vlan_tx_* helpers since "tx" is misleading there	2015-01-13 17:51:08 -05:00
fm10k	net: rename vlan_tx_* helpers since "tx" is misleading there	2015-01-13 17:51:08 -05:00
i40e	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2015-01-15 00:53:17 -05:00
i40evf	net: rename vlan_tx_* helpers since "tx" is misleading there	2015-01-13 17:51:08 -05:00
igb	net: rename vlan_tx_* helpers since "tx" is misleading there	2015-01-13 17:51:08 -05:00
igbvf	net: rename vlan_tx_* helpers since "tx" is misleading there	2015-01-13 17:51:08 -05:00
ixgb	net: rename vlan_tx_* helpers since "tx" is misleading there	2015-01-13 17:51:08 -05:00
ixgbe	net: rename vlan_tx_* helpers since "tx" is misleading there	2015-01-13 17:51:08 -05:00
ixgbevf	net: rename vlan_tx_* helpers since "tx" is misleading there	2015-01-13 17:51:08 -05:00
e100.c	e100: fix typo in MDI/MDI-X eeprom check in e100_phy_init	2014-12-31 11:55:40 -08:00
Kconfig	i40e: adds FCoE configure option	2015-01-14 16:48:39 -05:00
Makefile	fm10k: Add skeletal frame for Intel(R) FM10000 Ethernet Switch Host Interface Driver	2014-09-23 03:59:13 -07:00