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

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

Merge branch 'x86/pebs' into x86/unify-cpu-detect 



Conflicts:
	arch/x86/Kconfig.cpu
	include/asm-x86/ds.h

Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parents f69feff7 3c933904
Expand all 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