From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 19 Apr 2015 21:31:41 +0000 (-0700)
Subject: Merge branch 'turbostat' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux
X-Git-Tag: v4.1-rc1~75
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=09d51602cf84a1264946711dd4ea0dddbac599a1;p=linux-2.6-block.git

Merge branch 'turbostat' of git://git./linux/kernel/git/lenb/linux

Pull turbostat update from Len Brown:
 "Updates to the turbostat utility.

  Just one kernel dependency in this batch -- added a #define to
  msr-index.h"

* 'turbostat' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux:
  tools/power turbostat: correct dumped pkg-cstate-limit value
  tools/power turbostat: calculate TSC frequency from CPUID(0x15) on SKL
  tools/power turbostat: correct DRAM RAPL units on recent Xeon processors
  tools/power turbostat: Initial Skylake support
  tools/power turbostat: Use $(CURDIR) instead of $(PWD) and add support for O= option in Makefile
  tools/power turbostat: modprobe msr, if needed
  tools/power turbostat: dump MSR_TURBO_RATIO_LIMIT2
  tools/power turbostat: use new MSR_TURBO_RATIO_LIMIT names
  x86 msr-index: define MSR_TURBO_RATIO_LIMIT,1,2
  tools/power turbostat: label base frequency
  tools/power turbostat: update PERF_LIMIT_REASONS decoding
  tools/power turbostat: simplify default output
---

09d51602cf84a1264946711dd4ea0dddbac599a1