Merge branch 'acpi-scan' into acpi-cleanup

The following commits depend on the 'acpi-scan' material.