Learn more about cloning repositories
You have read-only access
Merge back earlier 'acpi-pci-hotplug' material. Conflicts: drivers/pci/hotplug/acpiphp_glue.c