From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Date: Wed, 20 Jun 2018 22:37:04 +0000 (+0200)
Subject: Merge branch 'turbostat' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux
X-Git-Tag: v4.18-rc2~26^2^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=3af20c9568264f6c7e6fad9a960fa8fcdd773388;p=thirdparty%2Fkernel%2Fstable.git

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

Pull turbostat utility changes for 4.18-rc2 from Len Brown.

"This includes two regression fixes, plus a couple more random, but
 worthy, patches."

* 'turbostat' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux:
  tools/power turbostat: version 18.06.20
  tools/power turbostat: add the missing command line switches
  tools/power turbostat: add single character tokens to help
  tools/power turbostat: alphabetize the help output
  tools/power turbostat: fix segfault on 'no node' machines
  tools/power turbostat: add optional APIC X2APIC columns
  tools/power turbostat: decode cpuid.1.HT
  tools/power turbostat: fix show/hide issues resulting from mis-merge
---

3af20c9568264f6c7e6fad9a960fa8fcdd773388