Merge branch 'acpi-pm'