tree e8de975fd5de6c95bf4329861a872dbcfe0c7ead
parent 2f5e98802350627ad6f2e3cee4d177059fc0c2f2
parent cd65718712469ad844467250e8fad20a5838baae
author Ingo Molnar <mingo@kernel.org> 1383042212 +0100
committer Ingo Molnar <mingo@kernel.org> 1383042212 +0100

Merge branch 'perf/urgent' into perf/core

Conflicts:
	tools/perf/builtin-record.c
	tools/perf/builtin-top.c
	tools/perf/util/hist.h