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
..
alx	cross-tree: phase out dma_zalloc_coherent()	2019-01-08 07:58:37 -05:00
atl1c	atl1c: fix indentation issue on an if statement	2019-02-02 20:14:38 -08:00
atl1e	net: atheros: replace dev_kfree_skb_irq by dev_consume_skb_irq for drop profiles	2019-02-13 20:50:42 -08:00
atlx	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2019-02-24 12:06:19 -08:00
Kconfig	drivers/net: remove all references to obsolete Ethernet-HOWTO	2015-06-23 06:50:35 -07:00
Makefile	License cleanup: add SPDX GPL-2.0 license identifier to files with no license	2017-11-02 11:10:55 +01:00