tree be17ee121f1c8814d8d39c9f3e0205d9397fab54
parent 35039eb6b199749943547c8572be6604edf00229
parent 3726cc75e581c157202da93bb2333cce25c15c98
author Ingo Molnar <mingo@elte.hu> 1258449403 +0100
committer Ingo Molnar <mingo@elte.hu> 1258449467 +0100

Merge branch 'perf/core' into perf/probes

Resolved merge conflict in tools/perf/Makefile

Merge reason: we want to queue up a dependent patch.

Signed-off-by: Ingo Molnar <mingo@elte.hu>