Learn more about cloning repositories
You have read-only access
Merge branch 'acpi-hotplug' into acpi-pci-hotplug Conflicts: drivers/acpi/scan.c