From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Date: Thu, 12 Feb 2015 01:09:10 +0000 (+0100)
Subject: Merge branch 'turbostat' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux... 
X-Git-Tag: v4.0-rc1~91^2^6
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=79b56ab8c3f64d05700bd3bcad79aa726931c150;p=thirdparty%2Fkernel%2Flinux.git

Merge branch 'turbostat' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux into pm-tools

Pull additional turbostat updates for v3.20 from Len Brown.

* 'turbostat' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux:
  tools/power turbostat: support additional Broadwell model
  tools/power turbostat: update parameters, documentation
  tools/power turbostat: Skip printing disabled package C-states
---

79b56ab8c3f64d05700bd3bcad79aa726931c150