Merge branch 'timers-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
commitecc8b655b38a880b578146895e0e1e2d477ca2c0
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 24 Jul 2008 19:55:01 +0000 (24 12:55 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 24 Jul 2008 19:55:01 +0000 (24 12:55 -0700)
tree4acce96bac00909fa9472f0c0669714243ea5bee
parent2528ce3237be4e900f5eaa455490146e1422e424
parente338125b8a886923ba8367207c144764dc352584
Merge branch 'timers-fixes-for-linus' of git://git./linux/kernel/git/tip/linux-2.6-tip

* 'timers-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  nohz: adjust tick_nohz_stop_sched_tick() call of s390 as well
  nohz: prevent tick stop outside of the idle loop
arch/sparc64/kernel/process.c
arch/x86/kernel/process_64.c
kernel/time/tick-sched.c