From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Date: Mon, 13 Nov 2017 00:41:20 +0000 (+0100)
Subject: Merge branch 'pm-sleep'
X-Git-Tag: v4.15-rc1~145^2~2
X-Git-Url: https://git.codelabs.ch/?p=muen%2Flinux.git;a=commitdiff_plain;h=05d658b5b57214944067fb4f62bce59200bf496f

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
---

05d658b5b57214944067fb4f62bce59200bf496f