tree 9a49056ae536d51cb8146c2fdbaaf751f75f9a7f
parent a58695bb9d63764da9607bf1e7ff09ef03b190a8
parent 1c9d80ddc60f8ac26344ec3db9830e5f8016c16d
author Linus Torvalds <torvalds@linux-foundation.org> 1257789075 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1257789075 -0800

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6

* 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.