aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/powercap
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2016-05-16 14:31:56 +0200
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2016-05-16 14:31:56 +0200
commit27c4a1c5ef61b6d4a9aeae68b24419b4319b97ed (patch)
tree55a244da63902500557830f73b22d9eaaf2781d4 /drivers/powercap
parentMerge branches 'pm-core' and 'pm-domains' (diff)
parentPM / AVS: rockchip-io: make io-domains a child of the GRF (diff)
parentPM / clk: ensure we don't allocate a -ve size of count clks (diff)
parentpowercap/intel_rapl: Add support for Kabylake (diff)
parentcpupower: fix potential memory leak (diff)
downloadlinux-dev-27c4a1c5ef61b6d4a9aeae68b24419b4319b97ed.tar.xz
linux-dev-27c4a1c5ef61b6d4a9aeae68b24419b4319b97ed.zip
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