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)
* master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6:
  [SPARC64]: store-init needs trailing membar.


Trivial merge