tree bc0555929c2ea50a7716ef980f197d76585527b8
parent b37fa16e78d6f9790462b3181602a26b5af36260
parent 8a4fd31e0e8dc33f00b8949a12ac56310bac57bc
author Linus Torvalds <torvalds@linux-foundation.org> 1279916642 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1279916642 -0700

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