From: Ingo Molnar <mingo@kernel.org>
Date: Sun, 7 Jun 2015 13:35:27 +0000 (+0200)
Subject: Merge branch 'x86/ras' into x86/core, to fix conflicts
X-Git-Tag: omap-for-v4.2/fixes-rc1^2~170^2^2~10
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c2f9b0af8bb4b2a5c020ae88efc9a624f59a7080;p=pandora-kernel.git

Merge branch 'x86/ras' into x86/core, to fix conflicts

Conflicts:
	arch/x86/include/asm/irq_vectors.h

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

c2f9b0af8bb4b2a5c020ae88efc9a624f59a7080
Reading git-diff-tree failed