Merge branch 'scsi-scan'
authorJeff Garzik <jgarzik@pobox.com>
Tue, 4 Oct 2005 18:24:04 +0000 (14:24 -0400)
committerJeff Garzik <jgarzik@pobox.com>
Tue, 4 Oct 2005 18:24:04 +0000 (14:24 -0400)
commit643736a58d2668af94aee05670c5e9ae76e7b85f
tree9ffda5b1611bef0daec14faf051354a7cfde0016
parent9d5b13021375cad2d64d56105e5f4b5f1509ced2
parent3f19ee8cb3a1003cb5183696bc55934f5865f868
Merge branch 'scsi-scan'
drivers/scsi/libata-core.c
drivers/scsi/libata-scsi.c