tree fa0208fa11662c2d36e74cf6152288f8fbf7ddc9
parent 86ed4aa457f9c832856156a2ee6477d108825855
parent 581f202bcd60acbc3af1f5faa429e570c512f8a3
author Linus Torvalds <torvalds@linux-foundation.org> 1260308301 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1260308301 -0800

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