tree 05b3ee6aef944b8e853269bac07d4cef0728c05c
parent 768d0c27226e6587cad2fcf543f9711da3f3774e
parent 294b0c9619a0469a3b385b6fc47e79f64222a692
parent fa84e9eecfff478df2d00e94deb3fc40fe4634ad
author Ingo Molnar <mingo@elte.hu> 1252051723 +0200
committer Ingo Molnar <mingo@elte.hu> 1252051727 +0200

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>