From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 25 Aug 2010 17:50:07 +0000 (-0700)
Subject: Merge branch 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Tag: v2.6.36-rc3~22
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=d4348c678977c7093438bbbf2067c49396ae941b;p=~shefty%2Frdma-dev.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, Pentium4: Clear the P4_CCCR_FORCE_OVF flag
  tracing/trace_stack: Fix stack trace on ppc64
---

d4348c678977c7093438bbbf2067c49396ae941b