tree b770d9e94545e198e120fac31f650600a855f689
parent 6e086437f35ad9fda448711732c4ce0f82aad569
parent 4464fcaa9cbfc9c551956b48af203e2f775ca892
author Ingo Molnar <mingo@elte.hu> 1250686235 +0200
committer Ingo Molnar <mingo@elte.hu> 1251098641 +0200

Merge branch 'perfcounters/urgent' into perfcounters/core

Conflicts:
	tools/perf/builtin-annotate.c
	tools/perf/builtin-report.c

Merge reason: resolve these conflicts.

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