Merge branch 'pm-sleep'
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Mon, 13 Nov 2017 00:41:20 +0000 (01:41 +0100)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Mon, 13 Nov 2017 00:41:20 +0000 (01:41 +0100)
commit05d658b5b57214944067fb4f62bce59200bf496f
treef2aa2537874ab5c4e37e6e7073e857150e9e1f08
parent794c33555f704047e4014d4601b3972cfbfe7e50
parent2dd9789c76ffde05d5f4c56f45c3cb71b3936694
Merge branch 'pm-sleep'

* pm-sleep:
  freezer: Fix typo in freezable_schedule_timeout() comment
  PM / s2idle: Clear the events_check_enabled flag
  PM / sleep: Remove pm_complete_with_resume_check()
  PM: ARM: locomo: Drop suspend and resume bus type callbacks
  PM: Use a more common logging style
  PM: Document rules on using pm_runtime_resume() in system suspend callbacks
Documentation/driver-api/pm/devices.rst
include/linux/freezer.h