commit ce84d539ce47484ff3cbc9c67b3eb69ae88954f9
author Linus Torvalds <torvalds@linux-foundation.org> Tue Jan 25 05:25:55 2011 +1000
committer Linus Torvalds <torvalds@linux-foundation.org> Tue Jan 25 05:25:55 2011 +1000
tree cdba43e845e23a6793ca47857a16fae6032becfb
parent bc094757f4f3d7b8211a8a1ed7605ffd7c728f75
parent b5cc8ca1c9c3a37eaddf709b2fd3e1699aee41ba

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

* 'timers-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  RTC: Remove Kconfig symbol for UIE emulation
  RTC: Properly handle rtc_read_alarm error propagation and fix bug
  RTC: Propagate error handling via rtc_timer_enqueue properly
  acpi_pm: Clear pmtmr_ioport if acpi_pm initialization fails
  rtc: Cleanup removed UIE emulation declaration
  hrtimers: Notify hrtimer users of switches to NOHZ mode