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)
commite4340bbb07dd38339c0773543dd928886e512a57
treef38d9d2f929037325362328415b2a1e7bfe52a15
parentc13dc31adb04c3f85d54d2fa13e34206f25742eb
parenta22c4d7e34402ccdf3414f64c50365436eba7b93
Merge branch 'linus' into core/rcu, to fix up a semantic conflict

Signed-off-by: Ingo Molnar <mingo@kernel.org>
kernel/sched/core.c