From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 3 Apr 2015 17:38:36 +0000 (-0700)
Subject: Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=ec2e76b4c73362231e7d6903e14fc9817d99f3ae;p=deliverable%2Flinux.git

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

Pull perf fixes from Ingo Molnar:
 "Two x86 Intel PMU constraint handling fixes"

* 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  perf/x86/intel: Fix Haswell CYCLE_ACTIVITY.* counter constraints
  perf/x86/intel: Filter branches for PEBS event
---

ec2e76b4c73362231e7d6903e14fc9817d99f3ae