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)
commit59b1c82500bb5d658891bc8e8a2308b76d58a4de
tree493aeea552ba7590b3652614b9caf2a5df11c69c
parent454aa3899f0bebb5aa7f8788690668d106f9a34f
parenta94a172d6c826232e623160ae134abbce181a41f
Merge git://git./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.