Merge branch 'pm-sleep' into acpi-battery