SCSI: small fixes from 2.6 tree, also remove erroneous Asus patch