From: Ingo Molnar Date: Wed, 23 Nov 2016 06:18:09 +0000 (+0100) Subject: Merge branch 'linus' into x86/fpu, to resolve conflicts X-Git-Tag: v4.10-rc1~180^2 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=064e6a8ba61a751625478f656c6f76a6f37a009e;p=karo-tx-linux.git Merge branch 'linus' into x86/fpu, to resolve conflicts Conflicts: arch/x86/kernel/fpu/core.c Signed-off-by: Ingo Molnar --- 064e6a8ba61a751625478f656c6f76a6f37a009e