]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
projects / thirdparty / kernel / linux.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 2e5e8fd bd6906e)
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)
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)

1  2 
arch/x86/include/asm/msr-index.h patch | diff1 | diff2 | blob | history

diff --cc arch/x86/include/asm/msr-index.h
Simple merge
A mirror of Linus' kernel repository