Merge branch 'timers-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
commitf0adc82064a5c28b34bdbc18e2d178c32094770b
authorLinus Torvalds <torvalds@linux-foundation.org>
Sun, 6 Feb 2011 20:05:15 +0000 (6 12:05 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sun, 6 Feb 2011 20:05:15 +0000 (6 12:05 -0800)
tree42c051d53c978c722687a2dc341f2b54db271417
parent43a723286f3cae795418c62bc41c3cce73791a81
parent55835eb62fad1253c9e657a667549945e4be9759
Merge branch 'timers-fixes-for-linus' of git://git./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.