From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 1 Nov 2013 19:54:51 +0000 (-0700)
Subject: Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Tag: v3.12~5
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=9581b7d2689ad9a0a20ddaec0427b46ad774585b;p=~emulex%2Finfiniband.git

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

Pull perf fixes from Ingo Molnar:
 "Two fixes:

   - Fix 'NMI handler took too long to run' false positives

     [ Genuine NMI overhead speedups will come for v3.13, this commit
       only fixes a measurement bug ]

   - Fix perf ring-buffer missed barrier causing (rare) ring-buffer data
     corruption on ppc64"

* 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  perf/x86: Fix NMI measurements
  perf: Fix perf ring buffer memory ordering
---

9581b7d2689ad9a0a20ddaec0427b46ad774585b