From: Ingo Molnar <mingo@kernel.org>
Date: Sun, 17 May 2015 05:58:08 +0000 (+0200)
Subject: Merge branch 'x86/asm' into x86/apic, to resolve conflicts
X-Git-Tag: omap-for-v4.2/fixes-rc1^2~170^2~21
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cffc32975da7df2ef909299c47ff644e1357e0ac;p=pandora-kernel.git

Merge branch 'x86/asm' into x86/apic, to resolve conflicts

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

cffc32975da7df2ef909299c47ff644e1357e0ac
Reading git-diff-tree failed