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

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

Merge branch 'linus' into stackprotector 

Conflicts:
	arch/x86/include/asm/pda.h
	kernel/fork.c
parents b2aaf8f7 6a94cb73
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