tree 8e8c18ebb4d57a4094f7fda24448b3e8567dcc6c
parent ac2a29c8a4a641574febccd10169b26138a5d656
parent 4c1ed5a6079078699128064664913ae7b079648f
parent 00dabd57e8207c6c7f3a5decc2c56e54951d568a
parent f4745a92781b872455f32feb01d1dce92aefcb6c
author Rafael J. Wysocki <rafael.j.wysocki@intel.com> 1441115617 +0200
committer Rafael J. Wysocki <rafael.j.wysocki@intel.com> 1441115617 +0200

Merge branches 'pm-cpuidle', 'pm-devfreq' and 'pm-clk'

* pm-cpuidle:
  cpuidle/coupled: Remove redundant 'dev' argument of cpuidle_state_is_coupled()
  cpuidle/coupled: Remove cpuidle_device::safe_state_index
  intel_idle: Skylake Client Support
  intel_idle: allow idle states to be freeze-mode specific

* pm-devfreq:
  PM / devfreq: exynos-ppmu: Update documentation to support PPMUv2
  PM / devfreq: exynos-ppmu: Add the support of PPMUv2 for Exynos5433
  PM / devfreq: event: Remove incorrect property in exynos-ppmu DT binding

* pm-clk:
  PM / clk: don't return int on __pm_clk_enable()