diff options
| author |   Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2017-02-06 14:52:10 +0100 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2017-02-06 14:52:10 +0100 |
| commit | cbf304e420da96992eae50bb6d51035681340ab8 (patch) | |
| tree | 76f729910e5fdca468464004f94b70b6b3cca81e /tools/perf/scripts/python/export-to-postgresql.py | |
| parent | Linux 4.10-rc7 (diff) | |
| parent | PM / runtime: Avoid false-positive warnings from might_sleep_if() (diff) | |
| parent | cpufreq: intel_pstate: Disable energy efficiency optimization (diff) | |
| download | linux-dev-cbf304e420da96992eae50bb6d51035681340ab8.tar.xz linux-dev-cbf304e420da96992eae50bb6d51035681340ab8.zip | |
Merge branches 'pm-core-fixes' and 'pm-cpufreq-fixes'
* pm-core-fixes:
PM / runtime: Avoid false-positive warnings from might_sleep_if()
* pm-cpufreq-fixes:
cpufreq: intel_pstate: Disable energy efficiency optimization
cpufreq: brcmstb-avs-cpufreq: properly retrieve P-state upon suspend
cpufreq: brcmstb-avs-cpufreq: extend sysfs entry brcm_avs_pmap