]> err.no Git - linux-2.6/commitdiff
projects / linux-2.6 / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 83f7a2c 10a398d)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/tglx/linux-2.6-hrt
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Sun, 9 Mar 2008 17:06:49 +0000 (10:06 -0700)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Sun, 9 Mar 2008 17:06:49 +0000 (10:06 -0700)
* 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()


Trivial merge
Linux 2.6 source tree