From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 6 Feb 2011 20:05:15 +0000 (-0800)
Subject: Merge branch 'timers-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Tag: v2.6.38-rc4~10
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=f0adc82064a5c28b34bdbc18e2d178c32094770b;p=~emulex%2Finfiniband.git

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.
---

f0adc82064a5c28b34bdbc18e2d178c32094770b