Merge branches 'acpi-scan' and 'acpi-prm'