diff options
author | 2015-12-14 22:58:57 +0100 | |
---|---|---|
committer | 2015-12-14 22:58:57 +0100 | |
commit | f1b9fc591e437ec07626ba84e1d81be19cb00eb6 (patch) | |
tree | 0e73c125aa10ad42900e4b799d19985116487c8d /tools/perf/util/scripting-engines/trace-event-python.c | |
parent | Linux 4.4-rc5 (diff) | |
parent | powercap / RAPL: fix BIOS lock check (diff) | |
parent | cpufreq: intel_pstate: Minor cleanup for FRAC_BITS (diff) | |
parent | PM / Domains: Allow runtime PM callbacks to be re-used during system PM (diff) | |
download | wireguard-linux-f1b9fc591e437ec07626ba84e1d81be19cb00eb6.tar.xz wireguard-linux-f1b9fc591e437ec07626ba84e1d81be19cb00eb6.zip |
Merge branches 'powercap', 'pm-cpufreq' and 'pm-domains'
* powercap:
powercap / RAPL: fix BIOS lock check
* pm-cpufreq:
cpufreq: intel_pstate: Minor cleanup for FRAC_BITS
cpufreq: tegra: add regulator dependency for T124
* pm-domains:
PM / Domains: Allow runtime PM callbacks to be re-used during system PM