Merge branches 'acpi-scan', 'acpi-hotplug' and 'acpi-pci'