Merge branch 'cpu_stop' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/misc...
Ingo Molnar [Sat, 8 May 2010 16:11:19 +0000 (18:11 +0200)]
1  2 
arch/s390/kernel/time.c
kernel/sched.c

Simple merge
diff --cc kernel/sched.c
Simple merge