Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/dlm
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 15 Oct 2009 22:21:20 +0000 (15:21 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 15 Oct 2009 22:21:20 +0000 (15:21 -0700)
commit8e7768d3f40d4ab79e6af58462e173cdbfad9cc6
tree5f47b220e4232d6483fff490290f6491d34a2a74
parent36d6f3ecbd0bedfbda8b9f7c5fc36edb62a417ad
parent6861f350785bf476c2d4e3b9cb69ee36b78df2fc
Merge branch 'for-linus' of git://git./linux/kernel/git/teigland/dlm

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/dlm:
  dlm: fix socket fd translation
  dlm: fix lowcomms_connect_node for sctp