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
..
Makefile	qede: Add dcbnl support.	2016-06-08 11:11:00 -07:00
qede_dcbnl.c	qede: Add dcbnl support.	2016-06-08 11:11:00 -07:00
qede_ethtool.c	qed*: Add support for the ethtool get_regs operation	2016-09-07 17:46:59 -07:00
qede_main.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2016-09-12 15:52:44 -07:00
qede.h	qede: Add support for Tx/Rx-only queues.	2016-08-23 17:11:54 -07:00