diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-09-04 10:08:43 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-09-04 10:08:47 +0200 |
| commit | 9aa55fbd01779a0b476d87cd9b5170fd5bebab1d (patch) | |
| tree | 05b3ee6aef944b8e853269bac07d4cef0728c05c /kernel/pid_namespace.c | |
| parent | 768d0c27226e6587cad2fcf543f9711da3f3774e (diff) | |
| parent | 294b0c9619a0469a3b385b6fc47e79f64222a692 (diff) | |
| parent | fa84e9eecfff478df2d00e94deb3fc40fe4634ad (diff) | |
Merge branches 'sched/domains' and 'sched/clock' into sched/core
Merge reason: both topics are ready now, and we want to merge dependent
changes.
Signed-off-by: Ingo Molnar <mingo@elte.hu>