Merge branches 'sched/domains' and 'sched/clock' into sched/core
commit9aa55fbd01779a0b476d87cd9b5170fd5bebab1d
authorIngo Molnar <mingo@elte.hu>
Fri, 4 Sep 2009 08:08:43 +0000 (4 10:08 +0200)
committerIngo Molnar <mingo@elte.hu>
Fri, 4 Sep 2009 08:08:47 +0000 (4 10:08 +0200)
tree05b3ee6aef944b8e853269bac07d4cef0728c05c
parent768d0c27226e6587cad2fcf543f9711da3f3774e
parent294b0c9619a0469a3b385b6fc47e79f64222a692
parentfa84e9eecfff478df2d00e94deb3fc40fe4634ad
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>
kernel/sched.c