David S. Miller 30d0844bdc Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: drivers/net/ethernet/mellanox/mlx5/core/en.h drivers/net/ethernet/mellanox/mlx5/core/en_main.c drivers/net/usb/r8152.c All three conflicts were overlapping changes. Signed-off-by: David S. Miller <davem@davemloft.net>		2016-07-06 10:35:22 -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-06-30 05:03:36 -04:00
qede	qede: Bump up driver version to 8.10.1.20	2016-07-01 05:40:53 -04:00
qlcnic	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2016-07-06 10:35:22 -07:00
qlge	net/qlge: Avoids recursive EEH error	2016-05-24 14:47:19 -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