From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 31 May 2015 18:39:25 +0000 (-0700)
Subject: Merge branch 'turbostat' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux
X-Git-Tag: Ubuntu-5.2.0-15.16~11279
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=50f5a1ee32ba2dd8f7221e4d841249edf81b9075;p=mirror_ubuntu-eoan-kernel.git

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

Pull turbostat tool fixes from Len Brown:
 "Just one minor 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: update version number to 4.7
  tools/power turbostat: allow running without cpu0
  tools/power turbostat: correctly decode of ENERGY_PERFORMANCE_BIAS
  tools/power turbostat: enable turbostat to support Knights Landing (KNL)
  tools/power turbostat: correctly display more than 2 threads/core
---

50f5a1ee32ba2dd8f7221e4d841249edf81b9075