From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Date: Mon, 26 Jun 2017 23:42:28 +0000 (+0200)
Subject: Merge branch 'turbostat' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux
X-Git-Tag: v4.13-rc1~174^2~5^2~3
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a8a13bfd5ac1a5ba63a722ae173cb2619db89c5c;p=thirdparty%2Fkernel%2Flinux.git

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

Pull turbostat fixes from Len Brown.

* 'turbostat' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux:
  tools/power turbostat: update version number
  tools/power turbostat: decode MSR_IA32_MISC_ENABLE only on Intel
  tools/power turbostat: stop migrating, unless '-m'
  tools/power turbostat: if  --debug, print sampling overhead
  tools/power turbostat: hide SKL counters, when not requested
---

a8a13bfd5ac1a5ba63a722ae173cb2619db89c5c