The following commit has been merged in the linux branch: commit 8e7768d3f40d4ab79e6af58462e173cdbfad9cc6 Merge: 36d6f3ecbd0bedfbda8b9f7c5fc36edb62a417ad 6861f350785bf476c2d4e3b9cb69ee36b78df2fc Author: Linus Torvalds torvalds@linux-foundation.org Date: Thu Oct 15 15:21:20 2009 -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