From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 9 Sep 2008 23:25:02 +0000 (-0700)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6
X-Git-Tag: v2.6.27-rc6~2
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5b0dac745f2e43836e8fb2920391834d8a8f7fed;p=linux-2.6

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().
---

5b0dac745f2e43836e8fb2920391834d8a8f7fed