diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2017-03-31 23:00:53 +0200 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2017-03-31 23:00:53 +0200 |
| commit | 46e1d5e972db830379533f4d2d282cbb812dbb9b (patch) | |
| tree | edec9180217e7a6670936e47d3c067cfca644d58 /drivers/hwtracing/intel_th/sth.h | |
| parent | c02ed2e75ef4c74e41e421acb4ef1494671585e8 (diff) | |
| parent | 2f0ba790df51721794c11abc7a076d407392f648 (diff) | |
| parent | 293d264f13cbde328d5477f49e3103edbc1dc191 (diff) | |
Merge branches 'pm-cpufreq-fixes' and 'pm-cpuidle-fixes'
* pm-cpufreq-fixes:
cpufreq: Fix creation of symbolic links to policy directories
* pm-cpuidle-fixes:
cpuidle: powernv: Pass correct drv->cpumask for registration