Merge branch 'acpi_pm_device_sleep_state' into release