[SCSI] Merge up to linux-2.6 head