From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 12 May 2008 14:28:37 +0000 (-0700)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6
X-Git-Tag: v2.6.26-rc3~134
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=59b1c82500bb5d658891bc8e8a2308b76d58a4de;p=linux-2.6-omap-h63xx.git

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: Work around memory probing bug in openfirmware.
  sparc32: fix rtrap.S typo
  sparc32: Fix build.
---

59b1c82500bb5d658891bc8e8a2308b76d58a4de