From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 18 Feb 2011 22:20:46 +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-rc6~19
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=0cc9d5257857608ba85885b75fcada13d359b5d1;p=users%2Fhch%2Fmisc.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: Re-enable UIE timer/polling emulation
  RTC: Revert UIE emulation removal
  RTC: Release mutex in error path of rtc_alarm_irq_enable
---

0cc9d5257857608ba85885b75fcada13d359b5d1