From: Ingo Molnar <mingo@kernel.org>
Date: Mon, 11 May 2015 09:56:27 +0000 (+0200)
Subject: Merge branch 'perf/urgent' into perf/core, to resolve conflicts
X-Git-Tag: kvm-4.2-2~159^2~46
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=f7dc7fd1c08c6d8109688694fd93d80645df89ff;p=users%2Fdwmw2%2Flinux.git

Merge branch 'perf/urgent' into perf/core, to resolve conflicts

Conflicts:
	tools/perf/builtin-kmem.c

Signed-off-by: Ingo Molnar <mingo@kernel.org>
---

f7dc7fd1c08c6d8109688694fd93d80645df89ff