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

Merge branch 'x86/asm' into x86/apic, to resolve a conflict

Conflicts:
	arch/x86/kernel/apic/io_apic.c
	arch/x86/kernel/apic/vector.c

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

191a66353b22fad8ac89404ab4c929cbe7b0afb2
Reading git-diff-tree failed