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
Loading
Loading
Loading
Loading

There are no changes