linux/drivers/net/ethernet/freescale
David S. Miller e2160156bf Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
All merge conflicts were simple overlapping changes.

Signed-off-by: David S. Miller <davem@davemloft.net>
2017-02-02 16:54:00 -05:00
..
dpaa drivers: net: generalize napi_complete_done() 2017-01-30 15:10:42 -05:00
fman fsl/fman: enable compilation on ARM64 2016-12-20 13:55:35 -05:00
fs_enet drivers: net: generalize napi_complete_done() 2017-01-30 15:10:42 -05:00
fec_main.c drivers: net: generalize napi_complete_done() 2017-01-30 15:10:42 -05:00
fec_mpc52xx_phy.c mdio: Move allocation of interrupts into core 2016-01-07 14:31:26 -05:00
fec_mpc52xx.c net: deprecate eth_change_mtu, remove usage 2016-10-13 09:36:57 -04:00
fec_mpc52xx.h
fec_ptp.c clocksource: Use a plain u64 instead of cycle_t 2016-12-25 11:04:12 +01:00
fec.h net: fec: cache statistics while device is down 2016-11-30 12:44:40 -05: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_ethtool.c Replace <asm/uaccess.h> with <linux/uaccess.h> globally 2016-12-24 11:46:01 -08:00
gianfar_ptp.c ptp: gianfar: Use high resolution frequency method. 2016-11-27 15:26:15 -05:00
gianfar.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2017-02-02 16:54:00 -05:00
gianfar.h Replace <asm/uaccess.h> with <linux/uaccess.h> globally 2016-12-24 11:46:01 -08:00
Kconfig Merge branch 'timers-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 2016-12-12 19:56:15 -08:00
Makefile Makefile: drop -D__CHECK_ENDIAN__ from cflags 2016-12-16 00:13:43 +02:00
ucc_geth_ethtool.c Replace <asm/uaccess.h> with <linux/uaccess.h> globally 2016-12-24 11:46:01 -08:00
ucc_geth.c drivers: net: generalize napi_complete_done() 2017-01-30 15:10:42 -05: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