diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-01-24 14:25:55 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-01-24 14:25:55 -0500 |
commit | ce84d539ce47484ff3cbc9c67b3eb69ae88954f9 (patch) | |
tree | cdba43e845e23a6793ca47857a16fae6032becfb /Makefile | |
parent | bc094757f4f3d7b8211a8a1ed7605ffd7c728f75 (diff) | |
parent | b5cc8ca1c9c3a37eaddf709b2fd3e1699aee41ba (diff) |
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
Diffstat (limited to 'Makefile')
0 files changed, 0 insertions, 0 deletions