From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Date: Mon, 24 Aug 2015 21:10:02 +0000 (+0200)
Subject: Merge branch 'turbostat' of https://git.kernel.org/pub/scm/linux/kernel/git/lenb... 
X-Git-Tag: v4.3-rc1~107^2^2~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=82bb70c599d81e6b2535f887b02e1719cc4856ac;p=thirdparty%2Fkernel%2Flinux.git

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

Pull turbostat changes for v4.3 from Len Brown.

* 'turbostat' of https://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux:
  tools/power turbostat: fix typo on DRAM column in Joules-mode
  tools/power turbostat: fix parameter passing for forked command
  tools/power turbostat: dump CONFIG_TDP
  tools/power turbostat: cpu0 is no longer hard-coded, so  update output
  tools/power turbostat: update turbostat(8)
---

82bb70c599d81e6b2535f887b02e1719cc4856ac