From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 14 Feb 2011 18:10:07 +0000 (-0800)
Subject: Merge branch 'rtc-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip... 
X-Git-Tag: v2.6.38-rc5~18
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=f1b6a4ec27f3c789c15a157590295c501b0a1c58;p=~shefty%2Frdma-dev.git

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

* 'rtc-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  RTC: Fix minor compile warning
  RTC: Convert rtc drivers to use the alarm_irq_enable method
  RTC: Fix rtc driver ioctl specific shortcutting
---

f1b6a4ec27f3c789c15a157590295c501b0a1c58