Merge branch 'linus' into core/locking
Ingo Molnar [Wed, 12 Nov 2008 11:39:21 +0000 (12:39 +0100)]
1  2 
include/linux/kernel.h
kernel/lockdep.c
kernel/sched.c

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