From: Linus Torvalds <torvalds@woody.linux-foundation.org>
Date: Sun, 9 Mar 2008 17:06:49 +0000 (-0700)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/tglx/linux-2.6-hrt
X-Git-Tag: v2.6.25-rc5~2
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=bf5a25e1fff88a1066e20cc7263329405e4939f6;p=~emulex%2Finfiniband.git

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()
---

bf5a25e1fff88a1066e20cc7263329405e4939f6