Merge HEAD from ../scsi-misc-2.6-tmp