Skip to content
GitLab
Commit bcef5081 authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

Merge branch 'acpi-config' into acpica 

Conflicts:
	include/acpi/platform/aclinux.h
parents d2716578 7919010c
Hide whitespace changes
Inline Side-by-side
Supports Markdown
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