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
..
netxen	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2016-05-09 15:59:24 -04:00
qed	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2016-09-12 15:52:44 -07:00
qede	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2016-09-12 15:52:44 -07:00
qlcnic	rtnetlink: fdb dump: optimize by saving last interface markers	2016-09-01 16:56:15 -07:00
qlge	net: qlge: remove superfluous statement	2016-08-01 13:32:52 -07:00
Kconfig	qlcnic: Replace ndo_add/del_vxlan_port with ndo_add/del_udp_enc_port	2016-06-17 20:23:31 -07:00
Makefile	qede: Add basic Network driver	2015-10-27 19:34:47 -07:00
qla3xxx.c	drivers/net: get rid of unnecessary initializations in .get_drvinfo()	2015-10-16 00:24:10 -07:00
qla3xxx.h	…