diff options
author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2017-02-16 00:55:42 +0100 |
---|---|---|
committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2017-02-16 00:55:42 +0100 |
commit | 4e628fac3887ee200c3766edd7c0e7b0ca6a0220 (patch) | |
tree | f2a63cf487675628abaeda9dbce561c57cf44c35 /tools | |
parent | 2b3022ab6b21df6103a48ca0cdfaf9738bb8e713 (diff) | |
parent | 16d0bf1882109da84b4b90d7ba4fc7ba18db0d67 (diff) | |
parent | 4f497a4310646f14ab518ab6108dbef07f4606af (diff) | |
parent | 09bb6e93956ae5175b96905b723ec879c3ca0765 (diff) | |
parent | 48385dd7400ee68fdc8af92a730c0d037df5a29e (diff) |
Merge branches 'pm-domains', 'pm-qos', 'pm-core' and 'pm-tools' into linux-next
* pm-domains:
PM / Domains: Provide dummy governors if CONFIG_PM_GENERIC_DOMAINS=n
PM / Domains: Fix asynchronous execution of *noirq() callbacks
PM / Domains: Correct comment in irq_safe_dev_in_no_sleep_domain()
PM / Domains: Rename functions in genpd for power on/off
* pm-qos:
PM / QoS: Remove unneeded linux/miscdevice.h include
* pm-core:
PM / wakeirq: report a wakeup_event on dedicated wekup irq
PM / wakeirq: Fix spurious wake-up events for dedicated wakeirqs
PM / wakeirq: Enable dedicated wakeirq for suspend
* pm-tools:
tools/power/x86: Debug utility for intel_pstate driver
AnalyzeSuspend: fix drag and zoom bug in javascript
scripts: analyze_suspend.py: Update to upstream v4.5
scripts: analyze_suspend.py: Update to upstream v4.4
scripts: analyze_suspend.py: Update to upstream v4.3