Merge branch 'linus' into locking/core, to pick up fixes

author Ingo Molnar <mingo@kernel.org>

Fri, 14 Apr 2017 08:29:40 +0000 (10:29 +0200)

committer Ingo Molnar <mingo@kernel.org>

Fri, 14 Apr 2017 08:29:40 +0000 (10:29 +0200)
author Ingo Molnar <mingo@kernel.org>
Fri, 14 Apr 2017 08:29:40 +0000 (10:29 +0200)
committer Ingo Molnar <mingo@kernel.org>
Fri, 14 Apr 2017 08:29:40 +0000 (10:29 +0200)
diff --cc include/linux/sched.h
Simple merge
diff --cc kernel/cpu.c
Simple merge
author	Ingo Molnar <mingo@kernel.org>
	Fri, 14 Apr 2017 08:29:40 +0000 (10:29 +0200)
committer	Ingo Molnar <mingo@kernel.org>
	Fri, 14 Apr 2017 08:29:40 +0000 (10:29 +0200)
		1	2
include/linux/sched.h	patch \|	diff1 \|	diff2 \|	blob \| history
kernel/cpu.c	patch \|	diff1 \|	diff2 \|	blob \| history