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
..
dwc_eth_qos.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2016-09-12 15:52:44 -07:00
Kconfig
Makefile