Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 9 Nov 2009 17:51:15 +0000 (09:51 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 9 Nov 2009 17:51:15 +0000 (09:51 -0800)
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6:
  sparc: Move of_set_property_mutex acquisition outside of devtree_lock grab.
  sparc64: replace parentheses in pmul()
  sparc64: Add a comment about why we only use certain memory barriers these days.


Trivial merge