Merge branch 'upstream'
authorJeff Garzik <jgarzik@pobox.com>
Sun, 9 Oct 2005 14:40:44 +0000 (10:40 -0400)
committerJeff Garzik <jgarzik@pobox.com>
Sun, 9 Oct 2005 14:40:44 +0000 (10:40 -0400)
commitffe75ef650e1aec26a84bd82a620b5e27df9ed34
tree8ed31fa093cbf6f6d6142e0e2118bee26aa71fa7
parent9dc263239bb2cfeb242d8ef758fca66a968822d5
parente710245bb0f980adfb1dfe850e43761a8117c6be
Merge branch 'upstream'
drivers/scsi/libata-scsi.c
drivers/scsi/libata.h