commit e56425b135a8892d1e71ad5bb605d12c10efeb32
author Linus Torvalds <torvalds@linux-foundation.org> Mon Mar 01 08:48:25 2010 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> Mon Mar 01 08:48:25 2010 -0800
tree 9bb899e1b6b45a125bcc21554f3673878d932035
parent 786f8ba2e9449a7f01ec6bc35838d0a335921061
parent 6622e670b26fbaa9c4ae7772a4d2d0abd3414b51

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