Merge branch 'rtc-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip...
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 14 Feb 2011 18:10:07 +0000 (10:10 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 14 Feb 2011 18:10:07 +0000 (10:10 -0800)
* '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


Trivial merge