Merge tag 'pm-4.15-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 15 Dec 2017 02:25:03 +0000 (18:25 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 15 Dec 2017 02:25:03 +0000 (18:25 -0800)
commit032b4cc8ff84490c4bc7c4ef8c91e6d83a637538
tree754079aaadebe052b28068659556343f92f69647
parent04243787812cabb57726e50d8288a3dcacf54ad2
parent3487972d7fa6c5143951436ada5933dcf0ec659d
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()