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

ACPI: fix git automerge failure 



Signed-off-by: default avatarLen Brown <len.brown@intel.com>
parent 463e7c7c
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