diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-03-15 18:59:21 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-03-15 18:59:21 -0700 |
commit | 21a32816b2e13eafb6d8a4589a84c6e629adc392 (patch) | |
tree | 8cfd2b8ffd355ef0954d6fef36aaffbc6fd53215 /arch/um | |
parent | 420c1c572d4ceaa2f37b6311b7017ac6cf049fe2 (diff) | |
parent | ea04683f592e6200b52e191b7e2842aedcfd88b6 (diff) | |
download | linux-21a32816b2e13eafb6d8a4589a84c6e629adc392.tar.gz linux-21a32816b2e13eafb6d8a4589a84c6e629adc392.tar.bz2 linux-21a32816b2e13eafb6d8a4589a84c6e629adc392.zip |
Merge branch 'timers-rtc-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'timers-rtc-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
RTC: Fix up rtc.txt documentation to reflect changes to generic rtc layer
RTC: sa1100: Update the sa1100 RTC driver.
RTC: Fix the cross interrupt issue on rtc-test.
RTC: Remove UIE and PIE information from the sa1100 driver proc.
RTC: Include information about UIE and PIE in RTC driver proc.
RTC: Clean out UIE icotl implementations
RTC: Cleanup rtc_class_ops->update_irq_enable()
RTC: Cleanup rtc_class_ops->irq_set_freq()
RTC: Cleanup rtc_class_ops->irq_set_state
RTC: Initialize kernel state from RTC
Diffstat (limited to 'arch/um')
0 files changed, 0 insertions, 0 deletions