Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Tue, 20 Mar 2007 03:20:56 +0000 (20:20 -0700)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Tue, 20 Mar 2007 03:20:56 +0000 (20:20 -0700)
commit0a14fe6e5efd0af0f9c6c01e0433445d615d0110
tree2f58c263c9d05ca5f96b22c3964dea1bc8ea2e57
parenta9cf7cd0d7474026d05296c666a0b7f83d798c03
parent24d559cac4d741d60ec85e927974408020a2f060
Merge /pub/scm/linux/kernel/git/davem/sparc-2.6

* master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6:
  [SPARC64]: store-init needs trailing membar.