From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 23 Jul 2010 20:24:02 +0000 (-0700)
Subject: Merge branch 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Tag: v2.6.35~44
X-Git-Url: http://bbs.cooldavid.org/git/?a=commitdiff_plain;h=339a2afcaafb16d6a07a859d7cc6078f9bfeca91;p=net-next-2.6.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 tools: Fix fallback to cplus_demangle() when bfd_demangle() is not available
  perf annotate: Fix handling of goto labels that are valid hex numbers
  tracing: Properly align linker defined symbols
  perf symbols: Fix directory descriptor leaking
  perf: Fix various display bugs with parent filtering
---

339a2afcaafb16d6a07a859d7cc6078f9bfeca91