From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Date: Fri, 5 Sep 2014 13:29:56 +0000 (+0200)
Subject: Merge branches 'pm-sleep', 'powercap', 'pm-domains' and 'pm-cpufreq'
X-Git-Tag: firefly_0821_release~176^2~3275^2
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=9aa4e2f6ac2e5d0729f5982fd0b070123808381e;p=firefly-linux-kernel-4.4.55.git

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
---

9aa4e2f6ac2e5d0729f5982fd0b070123808381e