Merge branch 'unlikely/sched' of git://git.kernel.org/pub/scm/linux/kernel/git/rosted...

author Ingo Molnar <mingo@elte.hu>

Fri, 3 Jun 2011 08:27:47 +0000 (10:27 +0200)

committer Ingo Molnar <mingo@elte.hu>

Fri, 3 Jun 2011 08:27:47 +0000 (10:27 +0200)
author Ingo Molnar <mingo@elte.hu>
Fri, 3 Jun 2011 08:27:47 +0000 (10:27 +0200)
committer Ingo Molnar <mingo@elte.hu>
Fri, 3 Jun 2011 08:27:47 +0000 (10:27 +0200)
diff --cc kernel/sched.c
Simple merge
diff --cc kernel/sched_rt.c
Simple merge
author	Ingo Molnar <mingo@elte.hu>
	Fri, 3 Jun 2011 08:27:47 +0000 (10:27 +0200)
committer	Ingo Molnar <mingo@elte.hu>
	Fri, 3 Jun 2011 08:27:47 +0000 (10:27 +0200)
		1	2
kernel/sched.c	patch \|	diff1 \|	diff2 \|	blob \| history
kernel/sched_rt.c	patch \|	diff1 \|	diff2 \|	blob \| history