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

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

Merge branch 'linus' into x86/pebs 



Conflicts:

	arch/x86/Kconfig.cpu
	arch/x86/kernel/cpu/intel.c
	arch/x86/kernel/setup_64.c

Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parents da7878d7 fb2e405f
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