Merge branch 'linus' into locking/core, to pick up fixes
authorIngo Molnar <mingo@kernel.org>
Fri, 14 Apr 2017 08:29:40 +0000 (10:29 +0200)
committerIngo Molnar <mingo@kernel.org>
Fri, 14 Apr 2017 08:29:40 +0000 (10:29 +0200)
Signed-off-by: Ingo Molnar <mingo@kernel.org>
1  2 
include/linux/sched.h
kernel/cpu.c

Simple merge
diff --cc kernel/cpu.c
Simple merge