Commit b169ba5a authored by Rafael J. Wysocki's avatar Rafael J. Wysocki

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

Conflicts:
	drivers/acpi/scan.c
parents 1f7c164b 8fcfb99c
Markdown is supported
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