From: Ingo Molnar <mingo@kernel.org>
Date: Mon, 4 Nov 2013 06:49:35 +0000 (+0100)
Subject: Merge branch 'perf/urgent' into perf/core to fix conflicts
X-Git-Tag: omap-for-v3.13/fixes-for-merge-window-take2~41^2~16
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2a3ede8cb2ddee5885518e4232aca13056f9a6e0;p=pandora-kernel.git

Merge branch 'perf/urgent' into perf/core to fix conflicts

Conflicts:
	tools/perf/bench/numa.c

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

2a3ede8cb2ddee5885518e4232aca13056f9a6e0
Reading git-diff-tree failed