David S. Miller 6abdd5f593 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... All three conflicts were cases of simple overlapping changes. Signed-off-by: David S. Miller <davem@davemloft.net>		2016-08-30 00:54:02 -04:00
..
fman
fs_enet
fec_main.c	net: fix up a few missing hashtable.h conflict resolutions	2016-08-13 14:51:02 -07:00
fec_mpc52xx_phy.c
fec_mpc52xx.c
fec_mpc52xx.h
fec_ptp.c
fec.h	ARM: SoC platform updates for v4.8	2016-08-01 18:27:08 -04:00
fsl_pq_mdio.c
gianfar_ethtool.c
gianfar_ptp.c
gianfar.c	gianfar: fix size of scatter-gathered frames	2016-08-23 16:49:00 -07:00
gianfar.h	gianfar: prevent fragmentation in DSA environments	2016-08-23 16:48:59 -07:00
Kconfig
Makefile
ucc_geth_ethtool.c
ucc_geth.c	net: ucc_geth: fix spelling mistake "propperty" -> "property"	2016-08-28 23:41:46 -04:00
ucc_geth.h
xgmac_mdio.c	net/fsl: use of_property_read_bool	2016-08-08 16:15:00 -07:00