From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Date: Mon, 16 Nov 2015 21:57:02 +0000 (+0100)
Subject: Merge branch 'pm-tools'
X-Git-Tag: firefly_0821_release~176^2~662^2~3
X-Git-Url: http://plrg.eecs.uci.edu/git/?p=firefly-linux-kernel-4.4.55.git;a=commitdiff_plain;h=d9f67dbc0f55e67dd18fc18fa05a9d5d2bd52914

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
---

d9f67dbc0f55e67dd18fc18fa05a9d5d2bd52914