David S. Miller 70f3522614 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Three conflicts, one of which, for marvell10g.c is non-trivial and requires some follow-up from Heiner or someone else. The issue is that Heiner converted the marvell10g driver over to use the generic c45 code as much as possible. However, in 'net' a bug fix appeared which makes sure that a new local mask (MDIO_AN_10GBT_CTRL_ADV_NBT_MASK) with value 0x01e0 is cleared. Signed-off-by: David S. Miller <davem@davemloft.net>		2019-02-24 12:06:19 -08:00
..
atl1.c	net: atheros: replace dev_kfree_skb_irq by dev_consume_skb_irq for drop profiles	2019-02-13 20:50:42 -08:00
atl1.h	atl1: update statistics code	2014-01-14 17:18:06 -08:00
atl2.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2019-02-24 12:06:19 -08:00
atl2.h	ethernet/atheros: use core min/max MTU checking	2016-10-18 11:34:18 -04:00
atlx.c	net: vlan: rename NETIF_F_HW_VLAN_* feature flags to NETIF_F_HW_VLAN_CTAG_*	2013-04-19 14:45:26 -04:00
atlx.h	atlx: Use ETH_ALEN	2012-03-19 16:53:08 -04:00
Makefile