From: Ingo Molnar <mingo@kernel.org>
Date: Thu, 1 May 2014 06:24:39 +0000 (+0200)
Subject: Merge branch 'perf/urgent' into perf/core, to resolve conflict
X-Git-Tag: omap-for-v3.16/fixes-against-rc1~34^2~31
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=aeffe2abc894b585acbe0923c0d4f21b4c5c1035;p=pandora-kernel.git

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

Conflicts:
	tools/perf/arch/x86/tests/dwarf-unwind.c

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

aeffe2abc894b585acbe0923c0d4f21b4c5c1035
Reading git-diff-tree failed