diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-09-05 15:29:56 +0200 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-09-05 15:29:56 +0200 |
| commit | 9aa4e2f6ac2e5d0729f5982fd0b070123808381e (patch) | |
| tree | 36a1a584a2ac1880fb0182a6ee96a88221a1fd03 | |
| parent | 73f517b85f2df58294c7ed4a3fb99a872a2c5a56 (diff) | |
| parent | 62109b43176b87e78b2b6d91bcfe16128c30229b (diff) | |
| parent | fcdf1797e1f8f6605b194e620a333e6d47e07672 (diff) | |
| parent | d07e9c178f188f76851aca8ab49a78da13dda006 (diff) | |
| parent | 73f1ae8ab08b4972052de7d0358f031ce0343fff (diff) | |
| download | linux-9aa4e2f6ac2e5d0729f5982fd0b070123808381e.tar.bz2 | |
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