Skip to content
Commit 064e6a8b authored by Ingo Molnar's avatar Ingo Molnar
Browse files

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



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

Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parents af25ed59 23400ac9
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment