diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-12-08 21:38:21 (GMT) |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-12-08 21:38:21 (GMT) |
commit | 4646575daf21f544fc2f7e8d90d8c488948fcc7c (patch) | |
tree | fa0208fa11662c2d36e74cf6152288f8fbf7ddc9 /arch/x86/include/asm/i8259.h | |
parent | 86ed4aa457f9c832856156a2ee6477d108825855 (diff) | |
parent | 581f202bcd60acbc3af1f5faa429e570c512f8a3 (diff) | |
download | linux-4646575daf21f544fc2f7e8d90d8c488948fcc7c.tar.xz |
Merge branch 'x86-uv-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'x86-uv-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
x86: UV RTC: Always enable RTC clocksource
x86: UV RTC: Rename generic_interrupt to x86_platform_ipi
x86: UV RTC: Clean up error handling
x86: UV RTC: Add clocksource only boot option
x86: UV RTC: Fix early expiry handling
Diffstat (limited to 'arch/x86/include/asm/i8259.h')
0 files changed, 0 insertions, 0 deletions