]> git.karo-electronics.de Git - mv-sheeva.git/commit - arch/cris/Kconfig
Merge branch 'timers-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 24 Jan 2011 19:25:55 +0000 (05:25 +1000)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 24 Jan 2011 19:25:55 +0000 (05:25 +1000)
commitce84d539ce47484ff3cbc9c67b3eb69ae88954f9
treecdba43e845e23a6793ca47857a16fae6032becfb
parentbc094757f4f3d7b8211a8a1ed7605ffd7c728f75
parentb5cc8ca1c9c3a37eaddf709b2fd3e1699aee41ba
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