| author | Linus Torvalds <torvalds@linux-foundation.org> | |
| Tue, 18 Dec 2012 20:34:29 +0000 (12:34 -0800) | ||
| committer | Linus Torvalds <torvalds@linux-foundation.org> | |
| Tue, 18 Dec 2012 20:34:29 +0000 (12:34 -0800) | ||
| commit | 6842d98de7bb726dfddc719cb9ae022b26a0f2b8 | |
| tree | 73c42dbbd09dc6697c601f23a9be3ccdbc54664b | tree | snapshot (tar.xz tar.gz zip) |
| parent | 758338e960ebe8ac3bef7ae11ff830bc2f9c655c | commit | diff |
| parent | 55f1f545f709a6023371848028a3029118855576 | commit | diff |
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
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
| arch/x86/include/uapi/asm/msr-index.h | diff1 | | diff2 | | blob | history |
| tools/power/x86/turbostat/Makefile | diff1 | | diff2 | | blob | history |