OpenCloudOS-Kernel/drivers/net/ethernet/qlogic
David S. Miller 101c431492 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
	drivers/net/ethernet/broadcom/genet/bcmgenet.c
	net/core/sock.c

Conflicts were overlapping changes in bcmgenet and the
lockdep handling of sockets.

Signed-off-by: David S. Miller <davem@davemloft.net>
2017-03-15 11:59:10 -07:00
..
netxen qlogic: netxen: constify bin_attribute structures 2017-02-22 15:39:09 -05:00
qed Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2017-03-15 11:59:10 -07:00
qede qed*: Add support for QL41xxx adapters 2017-03-14 11:43:30 -07:00
qlcnic scripts/spelling.txt: add "partiton" pattern and fix typo instances 2017-02-27 18:43:46 -08:00
qlge scripts/spelling.txt: add "overide" pattern and fix typo instances 2017-03-09 17:01:09 -08:00
Kconfig qed: Add support for hardware offloaded FCoE. 2017-02-19 18:10:42 -05:00
Makefile qede: Add basic Network driver 2015-10-27 19:34:47 -07:00
qla3xxx.c net: qlogic: qla3xxx: use new api ethtool_{get|set}_link_ksettings 2017-02-20 10:27:17 -05:00
qla3xxx.h