tree 73c42dbbd09dc6697c601f23a9be3ccdbc54664b
parent 758338e960ebe8ac3bef7ae11ff830bc2f9c655c
parent 55f1f545f709a6023371848028a3029118855576
author Linus Torvalds <torvalds@linux-foundation.org> 1355862869 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1355862869 -0800

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

Pull powertool update from Len Brown:
 "This updates the tree w/ the latest version of turbostat, which
  reports temperature and - on SNB and later - Watts."

Fix up semantic merge conflict as per Len.

* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux:
  tools: Allow tools to be installed in a user specified location
  tools/power: turbostat: make Makefile a bit more capable
  tools/power x86_energy_perf_policy: close /proc/stat in for_every_cpu()
  tools/power turbostat: v3.0: monitor Watts and Temperature
  tools/power turbostat: fix output buffering issue
  tools/power turbostat: prevent infinite loop on migration error path
  x86 power: define RAPL MSRs
  tools/power/x86/turbostat: share kernel MSR #defines