projects / openwrt / staging / blogic.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 8005c49 5369a21)
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)
* pm-tools:
  x86: remove unused definition of MSR_NHM_PLATFORM_INFO
  tools/power turbostat: use new name for MSR_PLATFORM_INFO

1  2 
arch/x86/include/asm/msr-index.h patch | diff1 | diff2 | blob | history

diff --cc arch/x86/include/asm/msr-index.h
Simple merge
John Crispins staging tree