diff options
author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2016-04-08 21:46:05 +0200 |
---|---|---|
committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2016-04-08 21:46:05 +0200 |
commit | fa81e66ec8648f62e96e95e53db2ea95a4b57b26 (patch) | |
tree | 7013e12f57394ac81f1f9d22cecfa214040365b5 /arch | |
parent | 9735a22799b9214d17d3c231fe377fc852f042e9 (diff) | |
parent | b318556479cc923970a79d6c2311138581c0db83 (diff) | |
parent | 3ce093d4de753d6c92cc09366e29d0618a62f542 (diff) | |
parent | 169b38373fd4a7d47cac0e5fdeeae90b8c076f32 (diff) | |
download | linux-fa81e66ec8648f62e96e95e53db2ea95a4b57b26.tar.bz2 |
Merge branches 'pm-cpufreq', 'pm-cpuidle' and 'acpi-cppc'
* pm-cpufreq:
cpufreq: dt: Drop stale comment
cpufreq: intel_pstate: Documenation for structures
cpufreq: intel_pstate: fix inconsistency in setting policy limits
intel_pstate: Avoid extra invocation of intel_pstate_sample()
intel_pstate: Do not set utilization update hook too early
* pm-cpuidle:
intel_idle: Add KBL support
intel_idle: Add SKX support
intel_idle: Clean up all registered devices on exit.
intel_idle: Propagate hot plug errors.
intel_idle: Don't overreact to a cpuidle registration failure.
intel_idle: Setup the timer broadcast only on successful driver load.
intel_idle: Avoid a double free of the per-CPU data.
intel_idle: Fix dangling registration on error path.
intel_idle: Fix deallocation order on the driver exit path.
intel_idle: Remove redundant initialization calls.
intel_idle: Fix a helper function's return value.
intel_idle: remove useless return from void function.
* acpi-cppc:
mailbox: pcc: Don't access an unmapped memory address space