Merge ../scsi-rc-fixes-2.6