summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2014-09-05 15:29:56 +0200
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2014-09-05 15:29:56 +0200
commit9aa4e2f6ac2e5d0729f5982fd0b070123808381e (patch)
tree36a1a584a2ac1880fb0182a6ee96a88221a1fd03 /include
parentMerge branches 'acpi-video' and 'acpi-ec' (diff)
parentPM / sleep: Fix test_suspend= command line option (diff)
parentpowercap / RAPL: change domain detection message (diff)
parentPM / domains: Make generic_pm_domain.name const (diff)
parentcpufreq: intel_pstate: Remove unneeded variable (diff)
downloadlinux-9aa4e2f6ac2e5d0729f5982fd0b070123808381e.tar.xz
linux-9aa4e2f6ac2e5d0729f5982fd0b070123808381e.zip
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