Merge ../scsi-misc-2.6