tree 95822dc50801e21cf1ad1e6aa7b58af898156517
parent 83f7a2c118833d3738b4d162ea3c17d0bd8ffa94
parent 10a398d04c4a1fc395840f4d040493375f562302
author Linus Torvalds <torvalds@woody.linux-foundation.org> 1205082409 -0700
committer Linus Torvalds <torvalds@woody.linux-foundation.org> 1205082409 -0700

Merge git://git.kernel.org/pub/scm/linux/kernel/git/tglx/linux-2.6-hrt

* git://git.kernel.org/pub/scm/linux/kernel/git/tglx/linux-2.6-hrt:
  time: remove obsolete CLOCK_TICK_ADJUST
  time: don't touch an offlined CPU's ts->tick_stopped in tick_cancel_sched_timer()
  time: prevent the loop in timespec_add_ns() from being optimised away
  ntp: use unsigned input for do_div()