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

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

Merge branch 'linus' into stackprotector 

Conflicts:
	arch/x86/kernel/Makefile
	include/asm-x86/pda.h
parents 4f962d4d 278429cf
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