From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 1 Mar 2010 16:48:25 +0000 (-0800)
Subject: Merge branch 'timers-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: v2.6.34-rc1~245
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=e56425b135a8892d1e71ad5bb605d12c10efeb32;p=~emulex%2Finfiniband.git

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

* 'timers-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  posix-timers.c: Don't export local functions
  clocksource: start CMT at clocksource resume
  clocksource: add suspend callback
  clocksource: add argument to resume callback
  ntp: Cleanup xtime references in ntp.c
  ntp: Make time_esterror and time_maxerror static
---

e56425b135a8892d1e71ad5bb605d12c10efeb32