linux/drivers/net/ethernet/freescale
David S. Miller 27058af401 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Mostly simple overlapping changes.

For example, David Ahern's adjacency list revamp in 'net-next'
conflicted with an adjacency list traversal bug fix in 'net'.

Signed-off-by: David S. Miller <davem@davemloft.net>
2016-10-30 12:42:58 -04:00
..
fman fsl/fman: fix error return code in mac_probe() 2016-10-17 13:16:52 -04:00
fs_enet net: fs_enet: Use net_device_stats from struct net_device 2016-10-19 10:37:04 -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 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2016-10-30 12:42:58 -04:00
fec_mpc52xx.c net: deprecate eth_change_mtu, remove usage 2016-10-13 09:36:57 -04:00
fec_mpc52xx.h
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 net/fsl_pq_mdio: use IS_ENABLED() instead of checking for built-in or module 2016-09-12 20:27:58 -07:00
gianfar.c ethernet: use core min/max MTU checking 2016-10-18 11:34:22 -04: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: deprecate eth_change_mtu, remove usage 2016-10-13 09:36:57 -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