diff options
author | Ingo Molnar <mingo@kernel.org> | 2012-05-17 12:17:10 +0200 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2012-05-17 12:17:12 +0200 |
commit | fac536f7e4927f34d480dc066f3a578c743b8f0e (patch) | |
tree | 13c8ecc3ea9132dcad74412778a6e84112083012 /kernel/freezer.c | |
parent | 13e099d2f77e1da3e4046860c48d956588633613 (diff) | |
parent | 30b4e9eb783d94e9f5d503b15eb31720679ae1c7 (diff) | |
download | talos-obmc-linux-fac536f7e4927f34d480dc066f3a578c743b8f0e.tar.gz talos-obmc-linux-fac536f7e4927f34d480dc066f3a578c743b8f0e.zip |
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>
Diffstat (limited to 'kernel/freezer.c')
0 files changed, 0 insertions, 0 deletions