Merge branch 'acpi-scan' to satisfy dependencies.