From: Linus Torvalds <torvalds@g5.osdl.org>
Date: Fri, 2 Jun 2006 23:02:22 +0000 (-0700)
Subject: Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
X-Git-Tag: v2.6.17-rc6~50
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=48e49ead3e92d53196a78c42cf24c0eed6ca98dd;p=users%2Fhch%2Fblock.git

Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6

* master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6:
  [SPARC64]: Fix D-cache corruption in mremap
  [SPARC64]: Make smp_processor_id() functional before start_kernel()
---

48e49ead3e92d53196a78c42cf24c0eed6ca98dd