aboutsummaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2009-10-15 15:21:20 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2009-10-15 15:21:20 -0700
commit8e7768d3f40d4ab79e6af58462e173cdbfad9cc6 (patch)
tree5f47b220e4232d6483fff490290f6491d34a2a74 /include
parent36d6f3ecbd0bedfbda8b9f7c5fc36edb62a417ad (diff)
parent6861f350785bf476c2d4e3b9cb69ee36b78df2fc (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
Diffstat (limited to 'include')
0 files changed, 0 insertions, 0 deletions