Merge branch 'linus'

Conflicts:

	drivers/scsi/ipr.c

Signed-off-by: James Bottomley <[email protected]>

diff --cc drivers/s390/scsi/zfcp_erp.c
Simple merge

diff --cc drivers/s390/scsi/zfcp_ext.h
Simple merge

diff --cc drivers/s390/scsi/zfcp_fsf.c
Simple merge

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

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