From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 15 May 2015 19:38:21 +0000 (-0700)
Subject: Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Tag: v4.1-rc4~19
X-Git-Url: http://git.cascardo.eti.br/?a=commitdiff_plain;h=ef4a293a4417fc5f50b0b83b62deb9ead8423256;p=cascardo%2Flinux.git

Merge branch 'perf-urgent-for-linus' of git://git./linux/kernel/git/tip/tip

Pull perf fixes from Ingo Molnar:
 "Mostly tooling fixes, but also a lockdep annotation fix, a PMU event
  list fix and a new model addition"

* 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  tools/liblockdep: Fix compilation error
  tools/liblockdep: Fix linker error in case of cross compile
  perf tools: Use getconf to determine number of online CPUs
  tools: Fix tools/vm build
  perf/x86/rapl: Enable Broadwell-U RAPL support
  perf/x86/intel: Fix SLM cache event list
  perf: Annotate inherited event ctx->mutex recursion
---

ef4a293a4417fc5f50b0b83b62deb9ead8423256