tree 5f815e837eacb11504f19c00e155befcecdf0903
parent 833961d81f0ece46b7884f988cc65509e2c49646
parent 830ec0458c390f29c6c99e1ff7feab9e36368d12
author Linus Torvalds <torvalds@linux-foundation.org> 1269641438 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1269641438 -0700

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

* 'timers-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  time: Fix accumulation bug triggered by long delay.
  posix-cpu-timers: Reset expire cache when no timer is running
  timer stats: Fix del_timer_sync() and try_to_del_timer_sync()
  clockevents: Sanitize min_delta_ns adjustment and prevent overflows