Merge remote-tracking branch 'scsi/for-next'

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/scsi/fnic/fnic_main.c
Simple merge

diff --cc drivers/scsi/hpsa.c
Simple merge

diff --cc drivers/scsi/lpfc/lpfc_init.c
Simple merge

diff --cc drivers/scsi/megaraid/megaraid_sas_base.c
Simple merge

diff --cc drivers/scsi/pm8001/pm8001_init.c
Simple merge

diff --cc drivers/scsi/qla4xxx/ql4_os.c
Simple merge