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

Skip to content
Commit 12436c30 authored by Tejun Heo's avatar Tejun Heo
Browse files

Merge branch 'irq-pio' 

Conflicts:

	drivers/scsi/libata-core.c
	include/linux/libata.h
parents 88ce7550 7894eaf2
Hide 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