Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 12 May 2008 14:28:37 +0000 (07:28 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 12 May 2008 14:28:37 +0000 (07:28 -0700)
* 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.


Trivial merge