Automatic merge of ../scsi-misc-2.6-old/