Merge branch 'pm-tools'
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Tue, 10 Feb 2015 15:11:26 +0000 (16:11 +0100)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Tue, 10 Feb 2015 15:11:26 +0000 (16:11 +0100)
commitb5e82233cab43c25fc0a1c28d9136a086db4aa52
treeb98690b48f829b3f500770df4b56919f24fee8b0
parent7bc95d4ef1033af808cb0714081cb45cd4ee5669
parent994b7f10b0ea3b70a19043f8adb3326707bdc2a9
Merge branch 'pm-tools'

* pm-tools:
  tools/power turbostat: relax dependency on APERF_MSR
  tools/power turbostat: relax dependency on invariant TSC
  tools/power turbostat: decode MSR_*_PERF_LIMIT_REASONS
  tools/power turbostat: relax dependency on root permission
  cpupower Makefile change to help run the tool without 'make install'
arch/x86/include/uapi/asm/msr-index.h