Merge branch 'sched/core-v2' of git://git.kernel.org/pub/scm/linux/kernel/git/frederi...
Ingo Molnar [Fri, 1 Jul 2011 11:20:51 +0000 (13:20 +0200)]
1  2 
include/linux/kernel.h
include/linux/sched.h
kernel/sched.c
lib/Kconfig.debug

Simple merge
Simple merge
diff --cc kernel/sched.c
Simple merge
Simple merge