]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branches 'pm-opp', 'pm-cpufreq' and 'pm-tools'
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Thu, 18 Dec 2014 17:44:53 +0000 (18:44 +0100)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Thu, 18 Dec 2014 17:44:53 +0000 (18:44 +0100)
commit8feb35efe2a2625ad0c831544f504d7236f08f28
treebe647a0849ee22724efc0c9d7a64f29ef952baaf
parent5a136ec4d7d31bb2fa25343320f9a3a13e9e2e24
parent730354c11414fa8e304c1a7383cb07e9de269087
parent687a713777508e55256e676d33646824cda10eb9
parentdf5487daf4c66f98e5711566a166c24d795786a8
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()"
Documentation/kernel-parameters.txt
MAINTAINERS