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

Conflicts:
	drivers/scsi/qla2xxx/qla_nx.c

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/ata/libata-core.c
Simple merge

diff --cc drivers/ata/libata-eh.c
Simple merge

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

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

diff --cc drivers/scsi/mpt2sas/mpt2sas_scsih.c
Simple merge

diff --cc drivers/scsi/qla2xxx/qla_nx.c
Simple merge

diff --cc drivers/scsi/qla2xxx/qla_os.c
Simple merge

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

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

diff --cc include/linux/libata.h
Simple merge