Merge branch 'turbostat' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux...
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Thu, 12 Feb 2015 01:09:10 +0000 (02:09 +0100)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Thu, 12 Feb 2015 01:09:10 +0000 (02:09 +0100)
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


Trivial merge