diff options
| author | Rafael J. Wysocki <[email protected]> | 2015-07-29 13:19:39 +0000 |
|---|---|---|
| committer | Rafael J. Wysocki <[email protected]> | 2015-07-29 13:19:39 +0000 |
| commit | d29809b8eb12d291d7b507fdaaa5e44707641685 (patch) | |
| tree | a63b3feb1586911187df7b6ef60d692f7a2fa08e /tools/perf/util/scripting-engines/trace-event-perl.c | |
| parent | cpufreq: Avoid attempts to create duplicate symbolic links (diff) | |
| parent | ACPI / PM: Use target_state to set the device power state (diff) | |
| download | kernel-d29809b8eb12d291d7b507fdaaa5e44707641685.tar.gz kernel-d29809b8eb12d291d7b507fdaaa5e44707641685.zip | |
Merge branches 'pm-cpufreq' and 'acpi-pm'
* pm-cpufreq:
cpufreq: Avoid attempts to create duplicate symbolic links
intel_pstate: Add get_scaling cpu_defaults param to Knights Landing
* acpi-pm:
ACPI / PM: Use target_state to set the device power state
Diffstat (limited to 'tools/perf/util/scripting-engines/trace-event-perl.c')
0 files changed, 0 insertions, 0 deletions