diff options
author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2015-12-07 02:17:17 +0100 |
---|---|---|
committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2015-12-07 02:17:17 +0100 |
commit | d89d7ff9edf58cbf8ad0f490694b2edea8eb3a39 (patch) | |
tree | 4fc5789486ca9ee0dad37c5fbee330d1484a2d58 | |
parent | MAINTAINERS: Add an entry for the PM core (diff) | |
parent | PM / sleep: prohibit devices probing during suspend/hibernation (diff) | |
parent | PM / runtime: Re-init runtime PM states at probe error and driver unbind (diff) | |
download | linux-d89d7ff9edf58cbf8ad0f490694b2edea8eb3a39.tar.xz linux-d89d7ff9edf58cbf8ad0f490694b2edea8eb3a39.zip |
Merge branches 'pm-sleep' and 'pm-runtime' into pm-core