linux/drivers/net/ethernet/freescale
David S. Miller 26440c835f Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
	drivers/net/usb/asix_common.c
	net/ipv4/inet_connection_sock.c
	net/switchdev/switchdev.c

In the inet_connection_sock.c case the request socket hashing scheme
is completely different in net-next.

The other two conflicts were overlapping changes.

Signed-off-by: David S. Miller <davem@davemloft.net>
2015-10-20 06:08:27 -07:00
..
fs_enet net: fs_enet: mask interrupts for TX partial frames. 2015-08-11 12:05:34 -07:00
Kconfig net/fsl: remove dependency FSL_SOC for Gianfar 2015-06-25 02:13:04 -07:00
Makefile gianfar: Remove sysfs stubs for FIFOCFG and stashing 2014-02-18 15:03:02 -05:00
fec.h net: fec: introduce fec_ptp_stop and use in probe fail path 2015-07-26 21:51:53 -07:00
fec_main.c net: fec: Remove unneeded FEATURES_NEED_QUIESCE definition 2015-09-28 22:31:12 -07:00
fec_mpc52xx.c net/fsl: constify of_device_id array 2015-03-17 15:00:21 -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 net/fsl: constify of_device_id array 2015-03-17 15:00:21 -04: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: fix computed address for the TBI register 2015-10-13 04:29:55 -07:00
gianfar.c gianfar: Add WAKE_UCAST and "wake-on-filer" support 2015-10-07 04:19:45 -07:00
gianfar.h gianfar: Add WAKE_UCAST and "wake-on-filer" support 2015-10-07 04:19:45 -07:00
gianfar_ethtool.c drivers/net: get rid of unnecessary initializations in .get_drvinfo() 2015-10-16 00:24:10 -07:00
gianfar_ptp.c net: gianfar_ptp: Fix module autoload for OF platform driver 2015-09-21 16:08:21 -07:00
ucc_geth.c net: fix phy refcounting in a bunch of drivers 2015-09-24 23:04:53 -07:00
ucc_geth.h net: remove skb recycling 2012-10-07 00:40:54 -04:00
ucc_geth_ethtool.c drivers/net: get rid of unnecessary initializations in .get_drvinfo() 2015-10-16 00:24:10 -07:00
xgmac_mdio.c net/fsl: constify of_device_id array 2015-03-17 15:00:21 -04:00