tree dda9505c22e85417ee752ef90ff7848126cca0f0
parent c58267e9fa7b0345dd9006939254701e3622ca6a
parent 0f02adaa49af23ab9fa05375f4a237da6014401b
author Linus Torvalds <torvalds@linux-foundation.org> 1435013141 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1435013141 -0700

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

Pull perf fixes from Ingo Molnar:
 "These are the left over fixes from the v4.1 cycle"

* 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  perf tools: Fix build breakage if prefix= is specified
  perf/x86: Honor the architectural performance monitoring version
  perf/x86/intel: Fix PMI handling for Intel PT
  perf/x86/intel/bts: Fix DS area sharing with x86_pmu events
  perf/x86: Add more Broadwell model numbers
  perf: Fix ring_buffer_attach() RCU sync, again