From: Ingo Molnar <mingo@kernel.org>
Date: Tue, 18 Aug 2015 07:39:47 +0000 (+0200)
Subject: Merge branch 'x86/urgent' into x86/asm to fix up conflicts and to pick up fixes
X-Git-Tag: omap-for-v4.3/fixes-merge-window~19^2~8
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a5dd19249607474ed680f16b4f5e8477d2b68689;p=pandora-kernel.git

Merge branch 'x86/urgent' into x86/asm to fix up conflicts and to pick up fixes

Conflicts:
	arch/x86/entry/entry_64_compat.S
	arch/x86/math-emu/get_address.c

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

a5dd19249607474ed680f16b4f5e8477d2b68689
Reading git-diff-tree failed