diff options
author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2015-08-24 23:10:02 +0200 |
---|---|---|
committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2015-08-24 23:10:02 +0200 |
commit | 82bb70c599d81e6b2535f887b02e1719cc4856ac (patch) | |
tree | 8287bf6923c0f3b09d0e298f240229037ccc68d4 /mm/zpool.c | |
parent | 2e5e8fd1ff9d802ab74df1ceaa5243da30491a45 (diff) | |
parent | bd6906ed3d7a00d55c9bd368a640ef83bb487d1d (diff) |
Merge branch 'turbostat' of https://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux into pm-tools
Pull turbostat changes for v4.3 from Len Brown.
* 'turbostat' of https://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux:
tools/power turbostat: fix typo on DRAM column in Joules-mode
tools/power turbostat: fix parameter passing for forked command
tools/power turbostat: dump CONFIG_TDP
tools/power turbostat: cpu0 is no longer hard-coded, so update output
tools/power turbostat: update turbostat(8)
Diffstat (limited to 'mm/zpool.c')
0 files changed, 0 insertions, 0 deletions