git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5856afe e88221c)
Merge branch 'x86/urgent' into x86/fpu, to resolve a conflict
authorIngo Molnar <mingo@kernel.org>
Wed, 20 May 2015 09:59:45 +0000 (11:59 +0200)
committerIngo Molnar <mingo@kernel.org>
Wed, 20 May 2015 10:01:01 +0000 (12:01 +0200)
Conflicts:
arch/x86/kernel/i387.c

This commit is conflicting:

  e88221c50cad ("x86/fpu: Disable XSAVES* support for now")

These functions changed a lot, move the quirk to arch/x86/kernel/fpu/init.c's
fpu__init_system_xstate_size_legacy().

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

Trivial merge
Pandora Kernel Repository