From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 22 Apr 2011 18:31:27 +0000 (-0700)
Subject: Merge branch 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Tag: v2.6.39-rc5~22
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=258ba6a5a9194ea043850f77d1219053c810e043;p=~emulex%2Finfiniband.git

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

* 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  perf, x86: Update/fix Intel Nehalem cache events
  perf, x86: P4 PMU - Don't forget to clear cpuc->active_mask on overflow
  x86, perf event: Turn off unstructured raw event access to offcore registers
  perf: Support Xeon E7's via the Westmere PMU driver
---

258ba6a5a9194ea043850f77d1219053c810e043