David S. Miller 13091aa305 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Honestly all the conflicts were simple overlapping changes, nothing really interesting to report. Signed-off-by: David S. Miller <davem@davemloft.net>		2019-06-17 20:20:36 -07:00
..
dpaa	dpaa_eth: use only online CPU portals	2019-05-28 11:19:55 -07:00
dpaa2	dpaa2-ptp: add interrupt support	2019-06-15 13:43:06 -07:00
enetc	enetc: Enable TC offloading with mqprio	2019-05-28 17:11:02 -07:00
fman	fsl/fman: include IPSEC SPI in the Keygen extraction	2019-05-28 11:21:03 -07:00
fs_enet	treewide: Add SPDX license identifier - Makefile/Kconfig	2019-05-21 10:50:46 +02:00
fec_main.c	net: fec_main: Use dev_err() instead of pr_err()	2019-06-09 13:31:26 -07:00
fec_mpc52xx_phy.c
fec_mpc52xx.c	net: ethernet: fix similar warning reported by kbuild test robot	2019-05-10 15:14:29 -07:00
fec_mpc52xx.h
fec_ptp.c	net: fec_ptp: Use dev_err() instead of pr_err()	2019-06-05 12:12:40 -07:00
fec.h	net: fec: remove workaround to restart phylib state machine on MDIO timeout	2018-12-18 15:01:55 -08:00
fsl_pq_mdio.c	treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 152	2019-05-30 11:26:32 -07:00
gianfar_ethtool.c	treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 362	2019-06-05 17:37:09 +02:00
gianfar.c	treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 152	2019-05-30 11:26:32 -07:00
gianfar.h	treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 152	2019-05-30 11:26:32 -07:00
Kconfig	treewide: Add SPDX license identifier - Makefile/Kconfig	2019-05-21 10:50:46 +02:00
Makefile	enetc: Introduce basic PF and VF ENETC ethernet drivers	2019-01-24 21:55:53 -08:00
ucc_geth_ethtool.c	treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 152	2019-05-30 11:26:32 -07:00
ucc_geth.c	treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 152	2019-05-30 11:26:32 -07:00
ucc_geth.h	treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 152	2019-05-30 11:26:32 -07:00
xgmac_mdio.c