From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 31 Dec 2009 19:56:24 +0000 (-0800)
Subject: Merge branch 'perf-fixes-for-linus-2' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Tag: v2.6.33-rc3~27
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=952363c90c93e967c8e1819131b68cbb6f9c962f;p=~shefty%2Frdma-dev.git

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

* 'perf-fixes-for-linus-2' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  perf: Fix NULL deref in inheritance code
  perf: Pass appropriate frame pointer to dump_trace()
---

952363c90c93e967c8e1819131b68cbb6f9c962f