David S. Miller 6b0a7f84ea Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflict resolution of af_smc.c from Stephen Rothwell. Signed-off-by: David S. Miller <davem@davemloft.net>		2019-04-17 11:26:25 -07:00
..
dpaa	ptp_qoriq: make structure/function names more consistent	2019-02-12 12:58:47 -05:00
dpaa2	dpaa2-eth: Add flow steering support without masking	2019-04-16 21:46:19 -07:00
enetc	enetc: Add ENETC PF level external MDIO support	2019-03-01 11:21:32 -08:00
fman	fsl/fman: Use vsprintf extension %pM	2019-03-03 21:10:06 -08:00
fs_enet
fec_main.c	net: fec: manage ahb clock in runtime pm	2019-04-11 13:53:28 -07:00
fec_mpc52xx_phy.c
fec_mpc52xx.c	net: fec_mpc52xx: replace dev_kfree_skb_irq by dev_consume_skb_irq for drop profiles	2019-02-06 17:38:15 -08:00
fec_mpc52xx.h
fec_ptp.c
fec.h
fsl_pq_mdio.c
gianfar_ethtool.c	ptp_qoriq: make structure/function names more consistent	2019-02-12 12:58:47 -05:00
gianfar.c
gianfar.h
Kconfig	enetc: Introduce basic PF and VF ENETC ethernet drivers	2019-01-24 21:55:53 -08:00
Makefile	enetc: Introduce basic PF and VF ENETC ethernet drivers	2019-01-24 21:55:53 -08:00
ucc_geth_ethtool.c
ucc_geth.c	ucc_geth: Reset BQL queue when stopping device	2019-01-30 10:36:23 -08:00
ucc_geth.h
xgmac_mdio.c