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

Merge branch 'acpi-cleanup' into acpi-hotplug 

Conflicts:
	drivers/acpi/scan.c
parents 8ff47aaf 8b48463f
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