Merge branch 'acpi-pm' into acpi-fan