Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 17 Jan 2018 20:26:37 +0000 (12:26 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 17 Jan 2018 20:26:37 +0000 (12:26 -0800)
Pull x86 perf fix from Ingo Molnar:
 "An Intel RAPL events fix"

* 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  perf/x86/rapl: Fix Haswell and Broadwell server RAPL event


Trivial merge