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)
commit6669dc89078da020241e78e5589489e494203332
treec897152d44348dc4571f228baea283b8f48b137c
parentec6e7f4082aa0c6c4334149e74673b6ed736fb63
parent6acbfb96976fc3350e30d964acb1dbbdf876d55e
Merge branch 'sched/urgent' into sched/core to avoid conflicts with upcoming changes

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