summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2014-12-18 18:44:53 +0100
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2014-12-18 18:44:53 +0100
commit2ec1c17cadd0b994732f292d4bc49fc3a05d85a4 (patch)
treebe647a0849ee22724efc0c9d7a64f29ef952baaf
parent035f10ee4e978db0a01d0f832e328b4a62f8310e (diff)
parent6ce4184d0308888dd6ac2b6ab5f8ec0b2006092e (diff)
parent7c1ac18dc02c105a199167ecc495944bd0e14d5a (diff)
parent2a813f1aaaf00a7eb65bef8da2fe9fcec0aabaaa (diff)
Merge branches 'pm-opp', 'pm-cpufreq' and 'pm-tools'
* pm-opp: PM / OPP: do error handling at the bottom of dev_pm_opp_add_dynamic() PM / OPP: handle allocation of device_opp in a separate routine PM / OPP: reuse find_device_opp() instead of duplicating code PM / OPP: Staticize __dev_pm_opp_remove() PM / OPP: replace kfree with kfree_rcu while freeing 'struct device_opp' * pm-cpufreq: MAINTAINERS: add entry for intel_pstate intel_pstate: Add a few comments intel_pstate: add kernel parameter to force loading * pm-tools: Revert "tools: cpupower: fix return checks for sysfs_get_idlestate_count()"