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

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

Merge branch 'x86/mm' into x86/asm to resolve conflict and to create common base 



 Conflicts:
	arch/x86/include/asm/cpufeature.h

Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parents cb44d0cf 1886297c
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment