From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 3 May 2008 17:05:11 +0000 (-0700)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6
X-Git-Tag: v2.6.26-rc1~6
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=bf640be423d60d954b9673527e106a461a129eb8;p=~emulex%2Finfiniband.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:
  sparc32: Delete prom_stdin and prom_stdout.
  sparc32: More memory probing consolidation.
  sparc32: Kill totally unused memory information tables.
  sparc64: Fix syscall restart, for real...
  serial: Fix sparc driver name strings.
  sparc64: Stop creating dummy root PCI host controller devices.
---

bf640be423d60d954b9673527e106a461a129eb8