tree 60fd5647f150a46e63093a41417c2eef3e776b3d
parent 9bf4e7fba8006d19846fec877b6da0616b2772de
parent 6beba7adbe092e63dfe8d09fbd1e3ec140474a13
author Ingo Molnar <mingo@elte.hu> 1256279000 +0200
committer Ingo Molnar <mingo@elte.hu> 1256279000 +0200

Merge branch 'perf/core' into perf/probes

Conflicts:
	tools/perf/Makefile

Merge reason:

 - fix the conflict
 - pick up the pr_*() infrastructure to queue up dependent patch

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