Merge branch 'linus' into core/locking

author Ingo Molnar <[email protected]>

Sat, 7 Feb 2009 17:31:54 +0000 (18:31 +0100)

committer Ingo Molnar <[email protected]>

Sat, 7 Feb 2009 17:31:54 +0000 (18:31 +0100)
author Ingo Molnar <[email protected]>
Sat, 7 Feb 2009 17:31:54 +0000 (18:31 +0100)
committer Ingo Molnar <[email protected]>
Sat, 7 Feb 2009 17:31:54 +0000 (18:31 +0100)
diff --cc include/linux/sched.h
Simple merge
diff --cc kernel/sched.c
Simple merge
author	Ingo Molnar <[email protected]>
	Sat, 7 Feb 2009 17:31:54 +0000 (18:31 +0100)
committer	Ingo Molnar <[email protected]>
	Sat, 7 Feb 2009 17:31:54 +0000 (18:31 +0100)
		1	2
include/linux/sched.h	patch \|	diff1 \|	diff2 \|	blob \| history
kernel/sched.c	patch \|	diff1 \|	diff2 \|	blob \| history