From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 20 Dec 2011 19:42:38 +0000 (-0800)
Subject: Merge branch 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=5fbd305dd2b661a243013cf444d2a32bfec2f701;p=~shefty%2Frdma-dev.git

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

* 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  time/clocksource: Fix kernel-doc warnings
  rtc: m41t80: Workaround broken alarm functionality
  rtc: Expire alarms after the time is set.
---

5fbd305dd2b661a243013cf444d2a32bfec2f701