diff options
author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2016-05-16 14:31:56 +0200 |
---|---|---|
committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2016-05-16 14:31:56 +0200 |
commit | 27c4a1c5ef61b6d4a9aeae68b24419b4319b97ed (patch) | |
tree | 55a244da63902500557830f73b22d9eaaf2781d4 /drivers/base | |
parent | aa24781b1cbd62cc7e7d2f1964bfd5727388bf3e (diff) | |
parent | bc19b9a81da009fd1d797d756d41b518ac7e5f14 (diff) | |
parent | 0b26985a7d76645598d98fec6922ddd1ec8cbc55 (diff) | |
parent | 6c51cc0203de25aeaff9d0236d6c2b497be93e3b (diff) | |
parent | 0b81561c1d30bb44e65d3725042e27b548bb1a86 (diff) | |
download | linux-27c4a1c5ef61b6d4a9aeae68b24419b4319b97ed.tar.gz linux-27c4a1c5ef61b6d4a9aeae68b24419b4319b97ed.tar.xz |
Merge branches 'pm-avs', 'pm-clk', 'powercap' and 'pm-tools'
* pm-avs:
PM / AVS: rockchip-io: make io-domains a child of the GRF
* pm-clk:
PM / clk: ensure we don't allocate a -ve size of count clks
* powercap:
powercap/intel_rapl: Add support for Kabylake
* pm-tools:
cpupower: fix potential memory leak
cpupower: Add cpuidle parts into library
cpupowerutils: bench: trivial fix of spelling mistake on "average"
Fix cpupower manpages "NAME" section
cpupower: bench: parse.c: fix several resource leaks
Honour user's LDFLAGS