Skip to content
Commit 4bcc7827 authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge tag 'v4.0-rc7' into x86/asm, to resolve conflicts 



Conflicts:
	arch/x86/kernel/entry_64.S

Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parents 3f705dfd f22e6e84
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