Merge branch 'acpi-scan'