summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2015-12-07 02:17:17 +0100
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2015-12-07 02:17:17 +0100
commitd89d7ff9edf58cbf8ad0f490694b2edea8eb3a39 (patch)
tree4fc5789486ca9ee0dad37c5fbee330d1484a2d58
parentMAINTAINERS: Add an entry for the PM core (diff)
parentPM / sleep: prohibit devices probing during suspend/hibernation (diff)
parentPM / runtime: Re-init runtime PM states at probe error and driver unbind (diff)
downloadlinux-d89d7ff9edf58cbf8ad0f490694b2edea8eb3a39.tar.xz
linux-d89d7ff9edf58cbf8ad0f490694b2edea8eb3a39.zip
Merge branches 'pm-sleep' and 'pm-runtime' into pm-core