David S. Miller 0f3e9c97eb Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... All of the conflicts were cases of overlapping changes. In net/core/devlink.c, we have to make care that the resouce size_params have become a struct member rather than a pointer to such an object. Signed-off-by: David S. Miller <davem@davemloft.net>		2018-03-06 01:20:46 -05:00
..
dpaa	dpaa_eth: Add allmulti option	2018-02-27 11:40:03 -05:00
fman	dpaa_eth: Add allmulti option	2018-02-27 11:40:03 -05:00
fs_enet	net: fs_enet: do not call phy_stop() in interrupts	2018-01-17 15:44:16 -05:00
fec_main.c	net: fec: add necessary defines to work on ARM64	2018-01-22 15:35:31 -05:00
fec_mpc52xx_phy.c
fec_mpc52xx.c
fec_mpc52xx.h
fec_ptp.c
fec.h	net: fec: add necessary defines to work on ARM64	2018-01-22 15:35:31 -05:00
fsl_pq_mdio.c
gianfar_ethtool.c
gianfar_ptp.c	net: gianfar_ptp: move set_fipers() to spinlock protecting area	2018-01-10 14:54:13 -05:00
gianfar.c	gianfar: Fix Rx byte accounting for ndev stats	2018-02-28 10:59:33 -05:00
gianfar.h
Kconfig
Makefile
ucc_geth_ethtool.c
ucc_geth.c
ucc_geth.h
xgmac_mdio.c