tree fd415067d4a215eb33966e7fd94f0f843686e26c
parent 6cac95296034bed7b2716d5f4e417a26a618da94
parent bdc2209fd246820de2816691ac0e82600885e1a8
author Linus Torvalds <torvalds@linux-foundation.org> 1313602299 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1313602299 -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 probe: Filter out redundant inline-instances
  perf probe: Search concrete out-of-line instances
  perf probe: Avoid searching variables in intermediate scopes
  perf probe: Fix to search local variables in appropriate scope
  perf probe: Warn when more than one line are given
  perf probe: Fix to walk all inline instances
  perf probe: Fix to search nested inlined functions in CU
  perf probe: Fix line walker to check CU correctly
  perf probe: Fix a memory leak for scopes array
  perf: fix temporary file ownership check
  perf report: Use properly build_id kernel binaries
  perf top browser: Remove spurious helpline update