Merge branch 'acpi-pm' into acpi-cleanup

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