From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 15 Dec 2017 02:25:03 +0000 (-0800)
Subject: Merge tag 'pm-4.15-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=032b4cc8ff84490c4bc7c4ef8c91e6d83a637538;p=linux.git

Merge tag 'pm-4.15-rc4' of git://git./linux/kernel/git/rafael/linux-pm

Pull power management fix from Rafael Wysocki:
 "This fixes an issue in two recent commits that may cause
  pm_runtime_enable() to be called for too many times for some devices
  during the "thaw" transition belonging to hibernation"

* tag 'pm-4.15-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
  PM / sleep: Avoid excess pm_runtime_enable() calls in device_resume()
---

032b4cc8ff84490c4bc7c4ef8c91e6d83a637538