commit | f3656b9a2740ebdff123b30b6b806648c9f189f8 | [log] [tgz] |
---|---|---|
author | Linus Torvalds <torvalds@woody.linux-foundation.org> | Fri Dec 07 10:59:33 2007 -0800 |
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | Fri Dec 07 10:59:33 2007 -0800 |
tree | 19f15333cfb031a732b12369eca5187afec0ed45 | |
parent | bbce0b5ca2884b44dbfffff77e876a90b4184516 [diff] | |
parent | b332b8bc9c67165eabdfc7d10b4a2e4cc9f937d0 [diff] |
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.