tree 42c051d53c978c722687a2dc341f2b54db271417
parent 43a723286f3cae795418c62bc41c3cce73791a81
parent 55835eb62fad1253c9e657a667549945e4be9759
author Linus Torvalds <torvalds@linux-foundation.org> 1297022715 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1297022715 -0800

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:
  lockdep, timer: Fix del_timer_sync() annotation
  RTC: Prevents a division by zero in kernel code.