Merge branches 'sched/clock', 'sched/urgent' and 'linus' into sched/core
Ingo Molnar [Fri, 13 Mar 2009 03:50:44 +0000 (04:50 +0100)]
1  2  3 
include/linux/sched.h
init/Kconfig

Simple merge
diff --cc init/Kconfig
Simple merge