From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 24 Jan 2011 19:25:55 +0000 (+1000)
Subject: Merge branch 'timers-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Tag: v2.6.38-rc3~69
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=ce84d539ce47484ff3cbc9c67b3eb69ae88954f9;p=~shefty%2Frdma-dev.git

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
---

ce84d539ce47484ff3cbc9c67b3eb69ae88954f9