From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 15 Oct 2009 22:21:20 +0000 (-0700)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/dlm
X-Git-Tag: v2.6.32-rc5~2
X-Git-Url: http://ftp.safe.ca/?p=safe%2Fjmp%2Flinux-2.6;a=commitdiff_plain;h=8e7768d3f40d4ab79e6af58462e173cdbfad9cc6

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

8e7768d3f40d4ab79e6af58462e173cdbfad9cc6