Merge branch 'sched/urgent' into sched/core
authorIngo Molnar <mingo@kernel.org>
Thu, 17 May 2012 10:17:10 +0000 (12:17 +0200)
committerIngo Molnar <mingo@kernel.org>
Thu, 17 May 2012 10:17:12 +0000 (12:17 +0200)
commitfac536f7e4927f34d480dc066f3a578c743b8f0e
tree13c8ecc3ea9132dcad74412778a6e84112083012
parent13e099d2f77e1da3e4046860c48d956588633613
parent30b4e9eb783d94e9f5d503b15eb31720679ae1c7
Merge branch 'sched/urgent' into sched/core

Merge reason: bring together all the pending scheduler bits,
              for the sched/numa changes.

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