Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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



Conflicts:
	arch/x86/kernel/entry_64.S

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