tree 5081777665805294041d25432c762bade095ed0f
parent 72ec94560d7ee1d3a61d5904fd9a5bf68bf3b11a
parent c197d758036d8c77923ae3f88571cf198283107e
parent d0563a039c9d35305f4cb2405665130de596d86a
author Rafael J. Wysocki <rafael.j.wysocki@intel.com> 1476446954 +0200
committer Rafael J. Wysocki <rafael.j.wysocki@intel.com> 1476446954 +0200

Merge branches 'pm-cpufreq' and 'pm-devfreq'

* pm-cpufreq:
  cpufreq: CPPC: Correct desired_perf calculation
  cpufreq: conservative: Fix next frequency selection
  cpufreq: skip invalid entries when searching the frequency
  cpufreq: intel_pstate: Fix struct pstate_adjust_policy kerneldoc
  cpufreq: intel_pstate: Proportional algorithm for Atom
  cpufreq: intel_pstate: Clarify comment in get_target_pstate_use_performance()
  cpufreq: intel_pstate: Fix unsafe HWP MSR access

* pm-devfreq:
  PM / devfreq: Skip status update on uninitialized previous_freq
  PM / devfreq: Add proper locking around list_del()
  PM / devfreq: exynos-nocp: Remove redundant code
  PM / devfreq: exynos-nocp: Select REGMAP_MMIO