Merge branch 'x86-uv-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 8 Dec 2009 21:38:21 +0000 (13:38 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 8 Dec 2009 21:38:21 +0000 (13:38 -0800)
commit4646575daf21f544fc2f7e8d90d8c488948fcc7c
treefa0208fa11662c2d36e74cf6152288f8fbf7ddc9
parent86ed4aa457f9c832856156a2ee6477d108825855
parent581f202bcd60acbc3af1f5faa429e570c512f8a3
Merge branch 'x86-uv-for-linus' of git://git./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
arch/x86/include/asm/hardirq.h
arch/x86/include/asm/hw_irq.h
arch/x86/include/asm/irq.h
arch/x86/kernel/entry_64.S
arch/x86/kernel/irq.c