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

Merge branch 'linus' into sched/urgent, to resolve conflicts



 Conflicts:
	arch/arm64/kernel/entry.S
	arch/x86/Kconfig
	include/linux/sched/mm.h
	kernel/fork.c

Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parents 32e839dd 68c5735e
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment