From: Ingo Molnar <mingo@kernel.org>
Date: Wed, 4 Feb 2015 08:01:12 +0000 (+0100)
Subject: Merge branch 'x86/asm' into perf/x86, to avoid conflicts with upcoming patches
X-Git-Tag: omap-for-v4.1/prcm-dts-mfd-syscon-fix~78^2~7
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0967160ad615985c7c35443156ea9aecc60c37b8;p=pandora-kernel.git

Merge branch 'x86/asm' into perf/x86, to avoid conflicts with upcoming patches

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

0967160ad615985c7c35443156ea9aecc60c37b8
Reading git-diff-tree failed