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)
commit7dfda84d1699c2ae2fbd82f3ce611af2ed7b18b3
treef960ab20ee3b3aadbef0eee95da85375da6c6d04
parentb8c22594b1c4c830c391dbf2e07afc14aca10460
parent1289e0e29857e606a70a0200bf7849ae38d3493a
Merge branch 'perf-urgent-for-linus' of git://git./linux/kernel/git/tip/tip

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