tree f2eb9c9e4f2066c2ff1a7a3853ee6231ef879c11
parent 9119e33e507d3b8fe234f2c2bafd3199ea2e883b
parent e8a923cc1fff6e627f906655ad52ee694ef2f6d7
author Linus Torvalds <torvalds@linux-foundation.org> 1383335691 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1383335691 -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:
 "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