Merge branch 'pm-tools'
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Mon, 16 Nov 2015 21:57:02 +0000 (22:57 +0100)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Mon, 16 Nov 2015 21:57:02 +0000 (22:57 +0100)
commitd9f67dbc0f55e67dd18fc18fa05a9d5d2bd52914
tree6121f08535ca972d3f47ac11abdc9414744a9e08
parent8005c49d9aea74d382f474ce11afbbc7d7130bec
parent5369a21e3f26ef9d2bf6ea1b322d6899a4ed08e0
Merge branch 'pm-tools'

* pm-tools:
  x86: remove unused definition of MSR_NHM_PLATFORM_INFO
  tools/power turbostat: use new name for MSR_PLATFORM_INFO
arch/x86/include/asm/msr-index.h