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

Merge back earlier 'acpi-pci-hotplug' material. 

Conflicts:
	drivers/pci/hotplug/acpiphp_glue.c
parents 72820594 21369c77
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment