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

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

Conflicts:
	include/acpi/acpi_bus.h
parents caa73ea1 f244d8b6
Hide whitespace changes
Inline Side-by-side
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