summaryrefslogtreecommitdiff
path: root/drivers/powercap
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2016-01-12 01:12:03 +0100
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2016-01-12 01:12:03 +0100
commit8f053a56dfa4be0cfcce49c7647adaa33196aae5 (patch)
tree9400cdd5317c1b36a23fdd9c90a18e4006f3af05 /drivers/powercap
parent932680692aeb115f84396ae7e44bf132c03635a1 (diff)
parenta1e9ca6967d68209c70e616a224efa89a6b86ca6 (diff)
parente98f033f94f385a9cf498d4e9f2ac1e6198b545a (diff)
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