Merge branch 'acpi-scan' into acpi-pm

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