Merge branch 'cpu_stop' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/misc...

author Ingo Molnar <mingo@elte.hu>

Sat, 8 May 2010 16:11:19 +0000 (18:11 +0200)

committer Ingo Molnar <mingo@elte.hu>

Sat, 8 May 2010 16:11:19 +0000 (18:11 +0200)
author Ingo Molnar <mingo@elte.hu>
Sat, 8 May 2010 16:11:19 +0000 (18:11 +0200)
committer Ingo Molnar <mingo@elte.hu>
Sat, 8 May 2010 16:11:19 +0000 (18:11 +0200)
diff --cc arch/s390/kernel/time.c
Simple merge
diff --cc kernel/sched.c
Simple merge
author	Ingo Molnar <mingo@elte.hu>
	Sat, 8 May 2010 16:11:19 +0000 (18:11 +0200)
committer	Ingo Molnar <mingo@elte.hu>
	Sat, 8 May 2010 16:11:19 +0000 (18:11 +0200)
		1	2
arch/s390/kernel/time.c	patch \|	diff1 \|	diff2 \|	blob \| history
kernel/sched.c	patch \|	diff1 \|	diff2 \|	blob \| history