summaryrefslogtreecommitdiff
path: root/drivers/base
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2015-09-01 16:53:37 +0300
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2015-09-01 16:53:37 +0300
commit5cf896b3c7842036ba37cc7057d74d5a2af159a7 (patch)
tree8e8c18ebb4d57a4094f7fda24448b3e8567dcc6c /drivers/base
parentac2a29c8a4a641574febccd10169b26138a5d656 (diff)
parent4c1ed5a6079078699128064664913ae7b079648f (diff)
parent00dabd57e8207c6c7f3a5decc2c56e54951d568a (diff)
parentf4745a92781b872455f32feb01d1dce92aefcb6c (diff)
downloadlinux-5cf896b3c7842036ba37cc7057d74d5a2af159a7.tar.xz
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()