From: Ingo Molnar <mingo@elte.hu>
Date: Mon, 5 Mar 2012 08:20:08 +0000 (+0100)
Subject: Merge branch 'perf/urgent' into perf/core
X-Git-Tag: firefly_0821_release~3680^2~2798^3~74
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=737f24bda723fdf89ecaacb99fa2bf5683c32799;p=firefly-linux-kernel-4.4.55.git

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>
---

737f24bda723fdf89ecaacb99fa2bf5683c32799