]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commit
Merge branch 'rtc-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip...
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 18 Feb 2011 22:20:46 +0000 (14:20 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 18 Feb 2011 22:20:46 +0000 (14:20 -0800)
commit0cc9d5257857608ba85885b75fcada13d359b5d1
treec36289844c623f2a3026f629d47cee793fb535ff
parent4c3021da451fe0ea1deaba8fa3805d8d065ec84e
parent456d66ecd09e3bc326b93174745faafb6ac378d6
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