Merge branch 'perf/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux...
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 10 Mar 2011 21:07:38 +0000 (13:07 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 10 Mar 2011 21:07:38 +0000 (13:07 -0800)
commitd9597075fb6feb1b3dc71c352e334c5b0a37afde
treeee86d62282fe508c254f30ed26c3208482811a96
parentba3820ade317ee36e496b9b40d2ec3987dd4aef0
parent7ee235efe5f86f239ce73915fd2e15f4d14259c6
Merge branch 'perf/urgent' of git://git./linux/kernel/git/tip/linux-2.6-tip

* 'perf/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  perf symbols: Avoid resolving [kernel.kallsyms] to real path for buildid cache
  perf symbols: Fix vmlinux path when not using --symfs