Merge branch 'sched/urgent' into sched/core to avoid conflicts with upcoming changes
authorIngo Molnar <mingo@kernel.org>
Thu, 22 May 2014 08:55:03 +0000 (10:55 +0200)
committerIngo Molnar <mingo@kernel.org>
Thu, 22 May 2014 08:55:03 +0000 (10:55 +0200)
Signed-off-by: Ingo Molnar <mingo@kernel.org>
1  2 
kernel/sched/core.c

Simple merge