David S. Miller b20b378d49 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: drivers/net/ethernet/mediatek/mtk_eth_soc.c drivers/net/ethernet/qlogic/qed/qed_dcbx.c drivers/net/phy/Kconfig All conflicts were cases of overlapping commits. Signed-off-by: David S. Miller <davem@davemloft.net>		2016-09-12 15:52:44 -07:00
..
Kconfig	sh_eth, ravb: Use ARCH_RENESAS	2016-03-03 17:09:08 -05:00
Makefile	Renesas Ethernet AVB PTP clock driver	2015-06-11 00:24:12 -07:00
ravb.h	net: ethernet: renesas: ravb: use phydev from struct net_device	2016-08-20 22:27:17 -07:00
ravb_main.c	ravb: avoid unused function warnings	2016-08-30 23:32:11 -07:00
ravb_ptp.c	ravb: make ravb_ptp_interrupt() *void*	2016-04-14 00:48:33 -04:00
sh_eth.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2016-09-12 15:52:44 -07:00
sh_eth.h	net: ethernet: renesas: sh_eth: use phydev from struct net_device	2016-08-10 23:14:53 -07:00