Skip to content
Commit 95c1e8b7 authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

Merge branches 'pm-core' and 'pm-acpi' into linux-next 

* pm-core:
  Revert "PM: runtime: Update device status before letting suppliers suspend"

* pm-acpi:
  Revert "PM: ACPI: reboot: Use S5 for reboot"
parents 1a7a93e8 0cab893f 9d3fcb28
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment