Merge branch 'cpu_stop' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/misc...
authorIngo Molnar <mingo@elte.hu>
Sat, 8 May 2010 16:11:19 +0000 (18:11 +0200)
committerIngo Molnar <mingo@elte.hu>
Sat, 8 May 2010 16:11:19 +0000 (18:11 +0200)
commite7858f52a5cb868289a72264534a1f05f3340c6c
treeaa7308603cf30d8aec6e45ecaddc6c8ed29d2edb
parent27a9da6538ee18046d7bff8e36a9f783542c54c3
parentbbf1bb3eee86f2eef2baa14e600be454d09109ee
Merge branch 'cpu_stop' of git://git./linux/kernel/git/tj/misc into sched/core
arch/s390/kernel/time.c
kernel/sched.c