diff options
| author | Linus Torvalds <[email protected]> | 2009-10-15 22:21:20 +0000 |
|---|---|---|
| committer | Linus Torvalds <[email protected]> | 2009-10-15 22:21:20 +0000 |
| commit | 8e7768d3f40d4ab79e6af58462e173cdbfad9cc6 (patch) | |
| tree | 5f47b220e4232d6483fff490290f6491d34a2a74 /fs/proc/array.c | |
| parent | Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kern... (diff) | |
| parent | dlm: fix socket fd translation (diff) | |
| download | kernel-8e7768d3f40d4ab79e6af58462e173cdbfad9cc6.tar.gz kernel-8e7768d3f40d4ab79e6af58462e173cdbfad9cc6.zip | |
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 'fs/proc/array.c')
0 files changed, 0 insertions, 0 deletions