Merge commit 'v2.6.39-rc7' into sched/core

author Ingo Molnar <mingo@elte.hu>

Thu, 12 May 2011 07:36:18 +0000 (09:36 +0200)

committer Ingo Molnar <mingo@elte.hu>

Thu, 12 May 2011 07:36:18 +0000 (09:36 +0200)
author Ingo Molnar <mingo@elte.hu>
Thu, 12 May 2011 07:36:18 +0000 (09:36 +0200)
committer Ingo Molnar <mingo@elte.hu>
Thu, 12 May 2011 07:36:18 +0000 (09:36 +0200)
diff --cc arch/arm/kernel/smp.c
Simple merge
diff --cc include/linux/sched.h
Simple merge
diff --cc init/Kconfig
Simple merge
author	Ingo Molnar <mingo@elte.hu>
	Thu, 12 May 2011 07:36:18 +0000 (09:36 +0200)
committer	Ingo Molnar <mingo@elte.hu>
	Thu, 12 May 2011 07:36:18 +0000 (09:36 +0200)
		1	2
arch/arm/kernel/smp.c	patch \|	diff1 \|	diff2 \|	blob \| history
include/linux/sched.h	patch \|	diff1 \|	diff2 \|	blob \| history
init/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history