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

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

Merge branch 'linus' into x86/cpu



Conflicts:

	arch/x86/kernel/cpu/intel_cacheinfo.c

Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parents cdcf772e c9272c4f
Loading
Loading
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment