]> 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)
commitfd5d67795019a043438edf3b327e8cce6bbccb03
tree36a1a584a2ac1880fb0182a6ee96a88221a1fd03
parentbb174d24a53e130c60f9e69aa48f8a4a80faac0b
parent0422c26243b6ee98b070d6a4ee45f4c0ff3d478c
parent705c7964c1daecc7ad056578a334e08ba0336d1e
parentc0c0f6ae17a161177c8b9ae7ffa75a2e9e5ee6dc
parentb4c44abefc608c17d4e81579b716f9e71e13e765
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