| commit | fac536f7e4927f34d480dc066f3a578c743b8f0e | [log] [tgz] |
|---|---|---|
| author | Ingo Molnar <mingo@kernel.org> | Thu May 17 12:17:10 2012 +0200 |
| committer | Ingo Molnar <mingo@kernel.org> | Thu May 17 12:17:12 2012 +0200 |
| tree | 13c8ecc3ea9132dcad74412778a6e84112083012 | |
| parent | 13e099d2f77e1da3e4046860c48d956588633613 [diff] | |
| parent | 30b4e9eb783d94e9f5d503b15eb31720679ae1c7 [diff] |
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>