Merge branch 'perf/urgent' into perf/core
authorIngo Molnar <mingo@elte.hu>
Wed, 17 Mar 2010 10:31:45 +0000 (11:31 +0100)
committerIngo Molnar <mingo@elte.hu>
Wed, 17 Mar 2010 10:31:48 +0000 (11:31 +0100)
commite4713e93b125497e9ba44d93de1bd9d8e5ad8946
treec57f865a10fc1b2419f83bcbbe4a46ee711a60a3
parent984763cb90d4b5444baa0c3e43feff7926bf1834
parenta6b84574eed7e4fd8cb8dac2d0926fe2cf34b941
Merge branch 'perf/urgent' into perf/core

Merge reason: We'll be queueing dependent changes.

Signed-off-by: Ingo Molnar <mingo@elte.hu>
tools/perf/builtin-top.c
tools/perf/util/symbol.c
tools/perf/util/symbol.h