| commit | 8e7768d3f40d4ab79e6af58462e173cdbfad9cc6 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Thu Oct 15 15:21:20 2009 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Thu Oct 15 15:21:20 2009 -0700 |
| tree | 5f47b220e4232d6483fff490290f6491d34a2a74 | |
| parent | 36d6f3ecbd0bedfbda8b9f7c5fc36edb62a417ad [diff] | |
| parent | 6861f350785bf476c2d4e3b9cb69ee36b78df2fc [diff] |
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