linux_dsm_epyc7002/drivers/net/ethernet/atheros
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
..
alx alx: fix alx_poll() 2015-01-11 21:45:50 -05:00
atl1c net: rename vlan_tx_* helpers since "tx" is misleading there 2015-01-13 17:51:08 -05:00
atl1e net: rename vlan_tx_* helpers since "tx" is misleading there 2015-01-13 17:51:08 -05:00
atlx net: rename vlan_tx_* helpers since "tx" is misleading there 2015-01-13 17:51:08 -05:00
Kconfig alx: remove NET_CORE Kconfig select 2013-07-01 13:18:19 -07:00
Makefile alx: add a simple AR816x/AR817x device driver 2013-06-17 16:04:34 -07:00