Merge branch 'linus' into sched/devel

author Ingo Molnar <mingo@elte.hu>

Mon, 23 Jun 2008 09:30:23 +0000 (11:30 +0200)

committer Ingo Molnar <mingo@elte.hu>

Mon, 23 Jun 2008 09:30:23 +0000 (11:30 +0200)
author Ingo Molnar <mingo@elte.hu>
Mon, 23 Jun 2008 09:30:23 +0000 (11:30 +0200)
committer Ingo Molnar <mingo@elte.hu>
Mon, 23 Jun 2008 09:30:23 +0000 (11:30 +0200)
diff --cc kernel/cpuset.c
Simple merge
diff --cc kernel/sched.c
Simple merge
author	Ingo Molnar <mingo@elte.hu>
	Mon, 23 Jun 2008 09:30:23 +0000 (11:30 +0200)
committer	Ingo Molnar <mingo@elte.hu>
	Mon, 23 Jun 2008 09:30:23 +0000 (11:30 +0200)
		1	2
kernel/cpuset.c	patch \|	diff1 \|	diff2 \|	blob \| history
kernel/sched.c	patch \|	diff1 \|	diff2 \|	blob \| history