diff options
| author | Linus Torvalds | 2012-12-18 21:34:29 +0100 |
|---|---|---|
| committer | Linus Torvalds | 2012-12-18 21:34:29 +0100 |
| commit | 6842d98de7bb726dfddc719cb9ae022b26a0f2b8 (patch) | |
| tree | 73c42dbbd09dc6697c601f23a9be3ccdbc54664b /arch/x86/kernel/cpu/mcheck/mce-internal.h | |
| parent | Merge branch 'tip/perf/core-2' of git://git.kernel.org/pub/scm/linux/kernel/g... (diff) | |
| parent | tools: Allow tools to be installed in a user specified location (diff) | |
| download | kernel-qcow2-linux-6842d98de7bb726dfddc719cb9ae022b26a0f2b8.tar.gz kernel-qcow2-linux-6842d98de7bb726dfddc719cb9ae022b26a0f2b8.tar.xz kernel-qcow2-linux-6842d98de7bb726dfddc719cb9ae022b26a0f2b8.zip | |
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux
Pull powertool update from Len Brown:
"This updates the tree w/ the latest version of turbostat, which
reports temperature and - on SNB and later - Watts."
Fix up semantic merge conflict as per Len.
* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux:
tools: Allow tools to be installed in a user specified location
tools/power: turbostat: make Makefile a bit more capable
tools/power x86_energy_perf_policy: close /proc/stat in for_every_cpu()
tools/power turbostat: v3.0: monitor Watts and Temperature
tools/power turbostat: fix output buffering issue
tools/power turbostat: prevent infinite loop on migration error path
x86 power: define RAPL MSRs
tools/power/x86/turbostat: share kernel MSR #defines
Diffstat (limited to 'arch/x86/kernel/cpu/mcheck/mce-internal.h')
0 files changed, 0 insertions, 0 deletions