]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commitbfdcaea946a29380f65dab4f8896c4013cecb4b1
tree6121f08535ca972d3f47ac11abdc9414744a9e08
parent837e0eb1c9d194f0eb3cf87d97b2235de146c9fe
parent52aac3d6a75fe050e1ca1f2eb8ca22afe7e3e83b
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