David S. Miller 9f6e055907 Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net ... The mptcp conflict was overlapping additions. The SMC conflict was an additional and removal happening at the same time. Signed-off-by: David S. Miller <davem@davemloft.net>		2020-02-27 18:31:39 -08:00
..
Kconfig	net: axienet: In kconfig remove arch dependency for axi_emac	2019-11-13 11:43:58 -08:00
ll_temac_main.c	net: ll_temac: Handle DMA halt condition caused by buffer underrun	2020-02-24 10:58:48 -08:00
ll_temac_mdio.c	net: ll_temac: Prepare indirect register access for multicast support	2019-05-23 09:33:57 -07:00
ll_temac.h	net: ll_temac: Handle DMA halt condition caused by buffer underrun	2020-02-24 10:58:48 -08:00
Makefile	License cleanup: add SPDX GPL-2.0 license identifier to files with no license	2017-11-02 11:10:55 +01:00
xilinx_axienet_main.c	net: axienet: use resolved link config in mac_link_up()	2020-02-27 12:02:14 -08:00
xilinx_axienet_mdio.c	net: axienet: Fix MDIO bus parent node detection	2019-06-06 16:24:30 -07:00
xilinx_axienet.h	net: axienet: convert to phylink API	2019-06-06 16:24:30 -07:00
xilinx_emaclite.c	netdev: pass the stuck queue to the timeout handler	2019-12-12 21:38:57 -08:00