From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 17 Jan 2018 20:26:37 +0000 (-0800)
Subject: Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=7dfda84d1699c2ae2fbd82f3ce611af2ed7b18b3;p=openwrt%2Fstaging%2Fblogic.git

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

7dfda84d1699c2ae2fbd82f3ce611af2ed7b18b3