Merge branch 'upstream'
authorJeff Garzik <jgarzik@pobox.com>
Tue, 13 Dec 2005 06:46:20 +0000 (01:46 -0500)
committerJeff Garzik <jgarzik@pobox.com>
Tue, 13 Dec 2005 06:46:20 +0000 (01:46 -0500)
commit80c7af4074cbb4cb6be5d35c443ea6d5e8838a84
treee900ad4c0beb4f44f0912b847c3319f11ef57d73
parent451ec6ab310602515b361418debe93d00f67e273
parentd00d598ffbba974d9045ba8b95296655fe2162c5
Merge branch 'upstream'
drivers/scsi/libata-scsi.c