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

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

Merge branch 'linus' into x86/asm, to pick up fixes and resolve conflicts



Conflicts:
	arch/x86/kernel/cpu/Makefile

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