[SCSI] Merge scsi-misc-2.6 into scsi-rc-fixes-2.6