Merge branch 'linus' into core/rcu, to fix up a semantic conflict
authorIngo Molnar <mingo@kernel.org>
Wed, 28 Oct 2015 12:17:01 +0000 (13:17 +0100)
committerIngo Molnar <mingo@kernel.org>
Wed, 28 Oct 2015 12:17:20 +0000 (13:17 +0100)
Signed-off-by: Ingo Molnar <mingo@kernel.org>
1  2 
kernel/sched/core.c

Simple merge