David S. Miller 60747ef4d1 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ...

Minor overlapping changes for both merge conflicts.

Resolution work done by Stephen Rothwell was used
as a reference.

Signed-off-by: David S. Miller <davem@davemloft.net>

2016-08-18 01:17:32 -04: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-08-18 01:17:32 -04:00

qede

qed*: Add and modify some prints

2016-08-15 13:34:52 -07:00

qlcnic

qlcnic: Update version to 5.3.65

2016-08-03 12:03:35 -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

…