]> 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)
commit3ce2dac177d58364b43671f94ccddbc988197bad
tree6121f08535ca972d3f47ac11abdc9414744a9e08
parent2715d332e6151136472842d51b2ec873c0652275
parentcb35cd6558dcb0731b0c56dafd06517226702538
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