From: Ingo Molnar <mingo@kernel.org>
Date: Wed, 23 Nov 2016 06:18:09 +0000 (+0100)
Subject: Merge branch 'linus' into x86/fpu, to resolve conflicts
X-Git-Tag: rel_imx_4.19.35_1.1.0~13615^2
X-Git-Url: https://git.somdevices.com/?a=commitdiff_plain;h=064e6a8ba61a751625478f656c6f76a6f37a009e;p=linux.git

Merge branch 'linus' into x86/fpu, to resolve conflicts

 Conflicts:
	arch/x86/kernel/fpu/core.c

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

064e6a8ba61a751625478f656c6f76a6f37a009e