tree cff6014a4da1da7c0f4ebc50557bb178958be2c3
parent bdce291a69a4de340eb5a0f7b87dd0d49744d6b6
parent 2eb2f77900d62796934bcd43c4089e444cf1179e
author Linus Torvalds <torvalds@linux-foundation.org> 1221002702 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1221002702 -0700

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6:
  sparc64: Disable timer interrupts in fixup_irqs().