]> 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)
commit2943141a1b46e1a9fd95a4d491ff7d765c0259e8
treebe647a0849ee22724efc0c9d7a64f29ef952baaf
parent908235529acc3afe1315bc19368deb7844fdd6ae
parentd0c05e531ba8b55bf59f557c07a985a698cb9dec
parentd32de8ba21d06f7f70e2af373580d402b6631690
parentbbfee650f719184201115e6c8c51e12c8c5d49b8
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