Merge SCSI tree from James Bottomley.