Merge branch 'acpi-scan' into acpi-pm