tree f960ab20ee3b3aadbef0eee95da85375da6c6d04
parent b8c22594b1c4c830c391dbf2e07afc14aca10460
parent 1289e0e29857e606a70a0200bf7849ae38d3493a
author Linus Torvalds <torvalds@linux-foundation.org> 1516220797 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1516220797 -0800

Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/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