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

Merge branch 'perf/urgent' into perf/core, to resolve conflict and to prepare for new patches

Conflicts:
	arch/x86/kernel/traps.c

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

ec00010972a0971b2c1da4fbe4e5c7d8ed1ecb05
Reading git-diff-tree failed