diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2017-03-03 00:43:11 +0100 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2017-03-03 00:43:11 +0100 |
| commit | 9b5e9cb164ee93ae19c4c6593e8188a55481f78b (patch) | |
| tree | 16683bc2fa716552e78844488ce27d00d5fdc941 /kernel | |
| parent | 21ff03c484a86e6ea28fcd1cd2a2fd2c924fb6e9 (diff) | |
| parent | de09cdd09fa12c3f837902680c3011d96e811821 (diff) | |
| parent | c3a49c8991212e1ef795c7a46881ac5cc7766993 (diff) | |
| parent | 2872de1382a7c888fa69532eda25aa7342dfe748 (diff) | |
| download | linux-9b5e9cb164ee93ae19c4c6593e8188a55481f78b.tar.bz2 | |
Merge branches 'pm-cpuidle', 'pm-cpufreq' and 'pm-sleep'
* pm-cpuidle:
intel_idle: stop exposing platform acronyms in sysfs
cpuidle: menu: Avoid taking spinlock for accessing QoS values
* pm-cpufreq:
cpufreq: intel_pstate: Fix limits issue with operation mode switching
cpufreq: qoriq: clean up unused code
* pm-sleep:
PM / hibernate: Define pr_fmt() and use pr_*() instead of printk()
PM / hibernate: Untangle power_down()