Merge branch 'turbostat' of https://git.kernel.org/pub/scm/linux/kernel/git/lenb...
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Mon, 24 Aug 2015 21:10:02 +0000 (23:10 +0200)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Mon, 24 Aug 2015 21:10:02 +0000 (23:10 +0200)
commit82bb70c599d81e6b2535f887b02e1719cc4856ac
tree8287bf6923c0f3b09d0e298f240229037ccc68d4
parent2e5e8fd1ff9d802ab74df1ceaa5243da30491a45
parentbd6906ed3d7a00d55c9bd368a640ef83bb487d1d
Merge branch 'turbostat' of https://git./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)
arch/x86/include/asm/msr-index.h