]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commit613dcbbb4c33b03efd4e75654c124aebc49caa4c
tree36a1a584a2ac1880fb0182a6ee96a88221a1fd03
parent131cebc52ae959519726cc30153e322ed4722a28
parent7bb33c30e754b93567445421a70d6ca7edf35b4b
parentc6584816a1abd563293c1d18eb50f516f67dfd00
parent696f6c516548ed576da9615d691d23f85bd97fdb
parent969d86809b18735507d034f1519f5a00c34e6281
Merge branches 'pm-sleep', 'powercap', 'pm-domains' and 'pm-cpufreq'

* 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