tree 5f47b220e4232d6483fff490290f6491d34a2a74
parent 36d6f3ecbd0bedfbda8b9f7c5fc36edb62a417ad
parent 6861f350785bf476c2d4e3b9cb69ee36b78df2fc
author Linus Torvalds <torvalds@linux-foundation.org> 1255645280 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1255645280 -0700

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/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