Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 9 Sep 2008 23:25:02 +0000 (16:25 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 9 Sep 2008 23:25:02 +0000 (16:25 -0700)
commit5b0dac745f2e43836e8fb2920391834d8a8f7fed
treecff6014a4da1da7c0f4ebc50557bb178958be2c3
parentbdce291a69a4de340eb5a0f7b87dd0d49744d6b6
parent2eb2f77900d62796934bcd43c4089e444cf1179e
Merge git://git./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().