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

Merge branch 'acpi-hotplug' into acpi-pci-hotplug 

Conflicts:
	drivers/acpi/scan.c
parents 1f7c164b 8fcfb99c
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment