From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 5 Oct 2010 18:57:37 +0000 (-0700)
Subject: Merge branch 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Tag: v2.6.36-rc7~7
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=39c12be86aaedd2f81bfb2236aca5333a2334dea;p=linux-pvops.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 trace scripting: Fix extern struct definitions
  perf ui hist browser: Fix segfault on 'a' for annotate
  perf tools: Fix build breakage
  perf, x86: Handle in flight NMIs on P4 platform
  oprofile, ARM: Release resources on failure
  oprofile: Add Support for Intel CPU Family 6 / Model 29
---

39c12be86aaedd2f81bfb2236aca5333a2334dea