linux/drivers/net/ethernet/freescale
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 remove lots of IS_ERR_VALUE abuses 2016-05-27 15:26:11 -07:00
fs_enet net: ethernet: fs-enet: use phy_ethtool_{get|set}_link_ksettings 2016-05-16 22:16:32 -04:00
Kconfig fsl/fman: Add FMan MURAM support 2015-12-27 20:51:39 -05:00
Makefile net: fec: make driver endian-safe 2016-01-25 10:51:52 -08:00
fec.h ARM: SoC platform updates for v4.8 2016-08-01 18:27:08 -04:00
fec_main.c net: fix up a few missing hashtable.h conflict resolutions 2016-08-13 14:51:02 -07:00
fec_mpc52xx.c net: ethernet: fec-mpc52xx: use phy_ethtool_{get|set}_link_ksettings 2016-05-16 22:20:06 -04:00
fec_mpc52xx.h drivers/net: fix up stale paths from driver reorg 2012-01-30 12:54:40 -05:00
fec_mpc52xx_phy.c mdio: Move allocation of interrupts into core 2016-01-07 14:31:26 -05:00
fec_ptp.c net: fec: avoid timespec use 2015-10-05 03:16:39 -07:00
fsl_pq_mdio.c powerpc updates for 4.5 2016-01-15 13:18:47 -08:00
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
gianfar_ethtool.c net: ethernet: gianfar: use phy_ethtool_{get|set}_link_ksettings 2016-05-16 21:51:40 -04:00
gianfar_ptp.c gianfar_ptp: replace get_of_u32 with of_property_read_u32 2016-02-25 16:22:02 -05:00
ucc_geth.c net: ucc_geth: fix spelling mistake "propperty" -> "property" 2016-08-28 23:41:46 -04:00
ucc_geth.h QE: Move QE from arch/powerpc to drivers/soc 2015-12-22 17:12:56 -06:00
ucc_geth_ethtool.c net: ethernet: ucc: move to new ethtool api {get|set}_link_ksettings 2016-05-03 13:03:52 -04:00
xgmac_mdio.c net/fsl: use of_property_read_bool 2016-08-08 16:15:00 -07:00