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

net: freescale: fix return type of ndo_start_xmit function

2018-09-21 19:12:13 -07:00

fec_main.c

net: fec: manage ahb clock in runtime pm

2019-04-11 13:53:28 -07:00

fec_mpc52xx_phy.c

mdio: Move allocation of interrupts into core

2016-01-07 14:31:26 -05:00

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

drivers/net: fix up stale paths from driver reorg

2012-01-30 12:54:40 -05:00

fec_ptp.c

net: fec: remove redundant variable 'inc'

2018-07-04 22:39:11 +09: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

net: fsl: Use device_type helpers to access the node type

2018-11-17 21:52:58 -08:00

gianfar_ethtool.c

ptp_qoriq: make structure/function names more consistent

2019-02-12 12:58:47 -05:00

gianfar.c

gianfar: Add change_carrier() for Fixed PHYs

2018-12-17 11:24:32 -08:00

gianfar.h

net: ethernet: gianfar_ethtool: get phc index through drvdata

2018-05-28 23:05:11 -04:00

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

net: ethernet: ucc: fix spelling mistake: "tx-late-collsion" -> "tx-late-collision"

2018-04-30 09:29:39 -04:00

ucc_geth.c

ucc_geth: Reset BQL queue when stopping device

2019-01-30 10:36:23 -08:00

ucc_geth.h

QE: Move QE from arch/powerpc to drivers/soc

2015-12-22 17:12:56 -06:00

xgmac_mdio.c

net/fsl: use of_property_read_bool

2016-08-08 16:15:00 -07:00