]> git.baikalelectronics.ru Git - kernel.git/commitdiff
projects / kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: bb174d2 0422c26 705c796 c0c0f6a b4c44ab)
Merge branches 'pm-sleep', 'powercap', 'pm-domains' and 'pm-cpufreq'
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Fri, 5 Sep 2014 13:29:56 +0000 (15:29 +0200)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Fri, 5 Sep 2014 13:29:56 +0000 (15:29 +0200)
* pm-sleep:
  PM / sleep: Fix test_suspend= command line option

* powercap:
  powercap / RAPL: change domain detection message
  powercap / RAPL: add support for CPU model 0x3f

* pm-domains:
  PM / domains: Make generic_pm_domain.name const

* pm-cpufreq:
  cpufreq: intel_pstate: Remove unneeded variable


Trivial merge
Linux Kernel Source Tree.