James Bottomley 2e1f44f6ad Merge branch 'fixes' into misc
Somewhat nasty merge due to conflicts between "33b28357dd00 scsi:
qla2xxx: Fix Async GPN_FT for FCP and FC-NVMe scan" and "2b5b96473efc
scsi: qla2xxx: Fix FC-NVMe LUN discovery"

Merge is non-trivial and has been verified by Qlogic (Cavium)

Signed-off-by: James E.J. Bottomley <jejb@linux.vnet.ibm.com>
2018-04-03 17:38:39 -07:00
..
2014-07-25 17:16:54 -04:00
2011-03-31 11:26:23 -03:00
2011-03-31 11:26:23 -03:00
2014-07-25 17:16:54 -04:00
2011-03-31 11:26:23 -03:00
2011-03-31 11:26:23 -03:00
2014-07-25 17:16:54 -04:00
2014-08-26 09:35:54 +02:00