Merge branch 'linus' into core/locking

author Ingo Molnar <mingo@elte.hu>

Wed, 12 Nov 2008 11:39:21 +0000 (12:39 +0100)

committer Ingo Molnar <mingo@elte.hu>

Wed, 12 Nov 2008 11:39:21 +0000 (12:39 +0100)
author Ingo Molnar <mingo@elte.hu>
Wed, 12 Nov 2008 11:39:21 +0000 (12:39 +0100)
committer Ingo Molnar <mingo@elte.hu>
Wed, 12 Nov 2008 11:39:21 +0000 (12:39 +0100)
diff --cc include/linux/kernel.h
Simple merge
diff --cc kernel/lockdep.c
Simple merge
diff --cc kernel/sched.c
Simple merge
author	Ingo Molnar <mingo@elte.hu>
	Wed, 12 Nov 2008 11:39:21 +0000 (12:39 +0100)
committer	Ingo Molnar <mingo@elte.hu>
	Wed, 12 Nov 2008 11:39:21 +0000 (12:39 +0100)
		1	2
include/linux/kernel.h	patch \|	diff1 \|	diff2 \|	blob \| history
kernel/lockdep.c	patch \|	diff1 \|	diff2 \|	blob \| history
kernel/sched.c	patch \|	diff1 \|	diff2 \|	blob \| history