David S. Miller 3793faad7b Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net ... Conflicts were all overlapping changes. Signed-off-by: David S. Miller <davem@davemloft.net>		2020-05-06 22:10:13 -07:00
..
dpaa	dpaa_eth: Fix comparing pointer to 0	2020-04-30 20:26:30 -07:00
dpaa2	dpaa2-eth: fix error return code in setup_dpni()	2020-04-30 20:40:31 -07:00
enetc	Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net	2020-05-06 22:10:13 -07:00
fman	Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net	2020-03-25 18:58:11 -07:00
fs_enet	net/freescale: Clean drivers from static versions	2020-03-03 17:54:55 -08:00
fec.h	net: ethernet: fec: Replace interrupt driven MDIO with polled IO	2020-05-02 16:41:34 -07:00
fec_main.c	net: ethernet: fec: Replace interrupt driven MDIO with polled IO	2020-05-02 16:41:34 -07:00
fec_mpc52xx.c	net: convert suitable network drivers to use phy_do_ioctl	2020-01-21 10:50:41 +01:00
fec_mpc52xx.h
fec_mpc52xx_phy.c
fec_ptp.c
fsl_pq_mdio.c
gianfar.c	net/freescale: Clean drivers from static versions	2020-03-03 17:54:55 -08:00
gianfar.h	net/freescale: Clean drivers from static versions	2020-03-03 17:54:55 -08:00
gianfar_ethtool.c	net: gianfar: reject unsupported coalescing params	2020-03-12 11:32:35 -07:00
Kconfig
Makefile
ucc_geth.c	net/freescale: Clean drivers from static versions	2020-03-03 17:54:55 -08:00
ucc_geth.h	net/freescale: Clean drivers from static versions	2020-03-03 17:54:55 -08:00
ucc_geth_ethtool.c	net/freescale: Don't set zero if FW not-available in ucc_geth	2020-03-03 17:54:55 -08:00
xgmac_mdio.c	net/fsl: treat fsl,erratum-a011043	2020-01-23 21:17:13 +01:00