Skip to content

L
linux-davinci
Commit c81e29b4 authored by Jeff Garzik's avatar Jeff Garzik
Browse files
Options

Merge branch 'upstream-fixes' into upstream 

Conflicts:

	drivers/scsi/libata-core.c
parents d3fb4e8d bb31a8fa
Show whitespace changes
Inline Side-by-side
Showing with 3 additions and 1 deletion
drivers/scsi/libata-core.c
View file @ c81e29b4
......@@ -3973,6 +3973,8 @@ static void ata_hsm_qc_complete(struct ata_queued_cmd *qc, int in_wq)
} else
ata_qc_complete(qc);
}
ata_altstatus(ap); /* flush */
}
/**
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment