Merge branch 'utilities' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Tue, 16 May 2017 01:15:27 +0000 (03:15 +0200)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Tue, 16 May 2017 01:15:27 +0000 (03:15 +0200)
commita32f80b30dae067357f96bc2a7f977e8a91b45ed
tree3c06a476a1923683ce97991a0a535315efeddf31
parent2ea659a9ef488125eb46da6eb571de5eae5c43f6
parent3cedbc5a6d7f7c5539e139f89ec9f6e1ed668418
Merge branch 'utilities' of git://git./linux/kernel/git/lenb/linux

Pull power management utilities updates from Len Brown.

* 'utilities' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux:
  intel_pstate: use updated msr-index.h HWP.EPP values
  tools/power x86_energy_perf_policy: support HWP.EPP
  x86: msr-index.h: fix shifts to ULL results in HWP macros.
  x86: msr-index.h: define HWP.EPP values
  x86: msr-index.h: define EPB mid-points
arch/x86/include/asm/msr-index.h
drivers/cpufreq/intel_pstate.c