Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
commitf3656b9a2740ebdff123b30b6b806648c9f189f8
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Fri, 7 Dec 2007 18:59:33 +0000 (7 10:59 -0800)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Fri, 7 Dec 2007 18:59:33 +0000 (7 10:59 -0800)
tree19f15333cfb031a732b12369eca5187afec0ed45
parentbbce0b5ca2884b44dbfffff77e876a90b4184516
parentb332b8bc9c67165eabdfc7d10b4a2e4cc9f937d0
Merge branch 'master' of /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.