Skip to content
Commit c81e29b4 authored by Jeff Garzik's avatar Jeff Garzik
Browse files

Merge branch 'upstream-fixes' into upstream 

Conflicts:

	drivers/scsi/libata-core.c
parents d3fb4e8d bb31a8fa
Hide whitespace changes
Inline Side-by-side
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