Merge branch 'sched/urgent' into sched/core, to avoid conflicts
authorIngo Molnar <mingo@kernel.org>
Wed, 7 May 2014 11:15:46 +0000 (13:15 +0200)
committerIngo Molnar <mingo@kernel.org>
Wed, 7 May 2014 11:15:46 +0000 (13:15 +0200)
Signed-off-by: Ingo Molnar <mingo@kernel.org>

Trivial merge