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

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

drivers/scsi/libata-core.c

+3 −1
Original line number Diff line number Diff line
@@ -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 */

}



/**