tree f2aa2537874ab5c4e37e6e7073e857150e9e1f08
parent 794c33555f704047e4014d4601b3972cfbfe7e50
parent 2dd9789c76ffde05d5f4c56f45c3cb71b3936694
author Rafael J. Wysocki <rafael.j.wysocki@intel.com> 1510533680 +0100
committer Rafael J. Wysocki <rafael.j.wysocki@intel.com> 1510533680 +0100

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