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

* '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

diff --cc arch/x86/kernel/tsc.c
Simple merge

diff --cc drivers/clocksource/sh_cmt.c
Simple merge

diff --cc kernel/time/clocksource.c
Simple merge

diff --cc kernel/time/timekeeping.c
Simple merge