Merge branch 'timers-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

* '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

diff --cc arch/sparc64/kernel/process.c
Simple merge

diff --cc arch/x86/kernel/process_64.c
Simple merge

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