Skip to content
Commit d0302bc6 authored by Len Brown's avatar Len Brown
Browse files

Merge branch 'misc' into release 



Conflicts:
	include/acpi/acpixf.h

Signed-off-by: default avatarLen Brown <len.brown@intel.com>
parents 106ad8d6 237889bf
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