tree 35495fff3e9956679cb5468e74e6814c8e44ee66
parent 8eedce996556d7d06522cd3a0e6069141c8dffe0
parent b7c924274c456499264d1cfa3d44063bb11eb5db
author Ingo Molnar <mingo@elte.hu> 1330935608 +0100
committer Ingo Molnar <mingo@elte.hu> 1330935608 +0100

Merge branch 'perf/urgent' into perf/core

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

Merge reason: resolve these cherry-picking conflicts.

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