David S. Miller 182ad468e7 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: drivers/net/ethernet/cavium/Kconfig The cavium conflict was overlapping dependency changes. Signed-off-by: David S. Miller <davem@davemloft.net>		2015-08-13 16:23:11 -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	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2015-08-13 16:23:11 -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	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2015-07-31 23:52:20 -07:00
fsl_pq_mdio.c	net/fsl: constify of_device_id array	2015-03-17 15:00:21 -04:00
gianfar.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2015-07-31 23:52:20 -07:00
gianfar.h	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2015-07-31 23:52:20 -07:00
gianfar_ethtool.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2015-08-13 16:23:11 -07:00
gianfar_ptp.c	ptp: gianfar: use helpers for converting ns to timespec.	2015-03-31 17:19:18 -04:00
ucc_geth.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2015-04-02 16:16:53 -04:00
ucc_geth.h	net: remove skb recycling	2012-10-07 00:40:54 -04:00
ucc_geth_ethtool.c	net: get rid of SET_ETHTOOL_OPS	2014-05-13 17:43:20 -04:00
xgmac_mdio.c	net/fsl: constify of_device_id array	2015-03-17 15:00:21 -04:00