From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Date: Tue, 18 Dec 2018 15:32:12 +0000 (+0100)
Subject: Merge branch 'turbostat' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux
X-Git-Tag: v5.0-rc1~178^2^4
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=584923efe91f29b01697b6cd7519c92bde9e11da;p=users%2Fjedix%2Flinux-maple.git

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

Pull turbostat utility updates for v4.21 from Len Brown:

"A couple of random fixes that were sitting in the queue."

* 'turbostat' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux:
  tools/power turbostat: consolidate duplicate model numbers
  tools/power turbostat: fix goldmont C-state limit decoding
  tools/power turbostat: reduce debug output
  tools/power turbosat: fix AMD APIC-id output
---

584923efe91f29b01697b6cd7519c92bde9e11da