Merge branch 'upstream'
authorJeff Garzik <jgarzik@pobox.com>
Sun, 30 Oct 2005 06:59:10 +0000 (01:59 -0500)
committerJeff Garzik <jgarzik@pobox.com>
Sun, 30 Oct 2005 06:59:10 +0000 (01:59 -0500)
commit9359ede748ff1461bf0632fb4182f61da4a2f9e2
tree4ec0c92b4998a535fc1180866a6dff9ad3bbb489
parent35ebbae2836a361330b784706b7140c90a346a53
parent81cfb8864c73230eb1c37753aba517db15cf4d8f
Merge branch 'upstream'
drivers/scsi/libata-scsi.c