David S. Miller dda922c831 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: drivers/net/phy/amd-xgbe-phy.c drivers/net/wireless/iwlwifi/Kconfig include/net/mac80211.h iwlwifi/Kconfig and mac80211.h were both trivial overlapping changes. The drivers/net/phy/amd-xgbe-phy.c file got removed in 'net-next' and the bug fix that happened on the 'net' side is already integrated into the rest of the amd-xgbe driver. Signed-off-by: David S. Miller <davem@davemloft.net>		2015-06-01 22:51:30 -07:00
..
Kconfig	qla2xxx: Add support to load firmware from file for ISP 26XX/27XX.	2015-04-10 08:41:50 -07:00
Makefile
qla_attr.c
qla_bsg.c
qla_bsg.h
qla_dbg.c	qla2xxx: Prevent multiple firmware dump collection for ISP27XX.	2015-04-10 08:42:49 -07:00
qla_dbg.h
qla_def.h	qla2xxx: Fix virtual port configuration, when switch port is disabled/enabled.	2015-04-10 08:42:58 -07:00
qla_devtbl.h
qla_dfs.c	scsi: print single-character strings with seq_putc	2015-02-02 09:57:46 -08:00
qla_fw.h
qla_gbl.h	qla2xxx: remove redundant declaration in 'qla_gbl.h'	2014-11-12 11:32:01 +01:00
qla_gs.c
qla_init.c	SCSI misc on 20150416	2015-04-16 19:02:04 -04:00
qla_inline.h
qla_iocb.c	scsi: remove abuses of scsi_populate_tag	2014-11-12 11:19:41 +01:00
qla_isr.c	qla2xxx: Restore physical port WWPN only, when port down detected for FA-WWPN port.	2015-04-10 08:43:07 -07:00
qla_mbx.c	qla2xxx: Add debugging info for MBX timeout.	2015-04-10 08:42:30 -07:00
qla_mid.c	SCSI misc on 20150416	2015-04-16 19:02:04 -04:00
qla_mr.c	scsi: remove abuses of scsi_populate_tag	2014-11-12 11:19:41 +01:00
qla_mr.h
qla_nx2.c	qla2xxx: remove redundant declaration in 'qla_gbl.h'	2014-11-12 11:32:01 +01:00
qla_nx2.h
qla_nx.c	treewide: Fix typo in printk messages	2015-03-06 23:05:39 +01:00
qla_nx.h
qla_os.c	SCSI misc on 20150416	2015-04-16 19:02:04 -04:00
qla_settings.h
qla_sup.c	qla2xxx: Fix beacon blink for ISP27XX.	2015-04-10 08:41:40 -07:00
qla_target.c	target: simplify the target template registration API	2015-04-14 12:28:41 -07:00
qla_target.h
qla_tmpl.c	qla2xxx: Prevent multiple firmware dump collection for ISP27XX.	2015-04-10 08:42:49 -07:00
qla_tmpl.h
qla_version.h	qla2xxx: Update driver version to 8.07.00.18-k	2015-04-10 08:43:17 -07:00
tcm_qla2xxx.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2015-06-01 22:51:30 -07:00
tcm_qla2xxx.h	tcm_qla2xxx: Add fabric_prot_type attribute support	2015-04-07 23:27:47 -07:00