From: Linus Torvalds <torvalds@woody.linux-foundation.org>
Date: Fri, 7 Dec 2007 18:59:33 +0000 (-0800)
Subject: Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
X-Git-Tag: v2.6.24-rc5~53
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=f3656b9a2740ebdff123b30b6b806648c9f189f8;p=users%2Fhch%2Fxfs.git

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

* 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6:
  [SPARC64]: Fix memory controller register access when non-SMP.
---

f3656b9a2740ebdff123b30b6b806648c9f189f8