From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Date: Tue, 12 Jan 2016 00:12:03 +0000 (+0100)
Subject: Merge branches 'pm-sleep' and 'pm-tools'
X-Git-Tag: v4.5-rc1~125^2~1
X-Git-Url: https://git.kernelconcepts.de/?a=commitdiff_plain;h=8f053a56dfa4be0cfcce49c7647adaa33196aae5;p=karo-tx-linux.git

Merge branches 'pm-sleep' and 'pm-tools'

* pm-sleep:
  PM / sleep: Add support for read-only sysfs attributes

* pm-tools:
  cpupower: fix how "cpupower frequency-info" interprets latency
  cpupower: rework the "cpupower frequency-info" command
  cpupower: Do not analyse offlined cpus
  cpupower: Provide STATIC variable in Makefile for debug builds
  cpupower: Fix precedence issue
---

8f053a56dfa4be0cfcce49c7647adaa33196aae5