Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4bbf7bc4 authored by Jeff Garzik's avatar Jeff Garzik
Browse files

Merge branch 'upstream' 

Conflicts:

	drivers/scsi/libata-core.c
parents 84ac69e8 aec5c3c1
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment