summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2015-09-18 23:05:28 +0200
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2015-09-18 23:05:28 +0200
commit7dc1d36e8ef8f78f9dadf0476081f3c7ff7f79be (patch)
tree51d4e69480765476d938d4039ea10121e198da21
parent6ff33f3902c3b1c5d0db6b1e2c70b6d76fba357f (diff)
parent1f0bd44e937468446d080b98b5669844744c24a1 (diff)
parent4184a8fc57a43faa2625988cc87031db77af9d98 (diff)
downloadlinux-sh-7dc1d36e8ef8f78f9dadf0476081f3c7ff7f79be.tar.gz
Merge branches 'pm-cpufreq' and 'pm-devfreq'
* pm-cpufreq: cpufreq: acpi-cpufreq: Use cpufreq_cpu_get_raw() in ->get() * pm-devfreq: PM / devfreq: Fix incorrect type issue. PM / devfreq: tegra: Update governor to use devfreq_update_stats() PM / devfreq: comments for get_dev_status usage updated PM / devfreq: drop comment about thermal setting max_freq PM / devfreq: cache the last call to get_dev_status() PM / devfreq: Drop unlikely before IS_ERR(_OR_NULL) PM / devfreq: exynos-ppmu: bit-wise operation bugfix. 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