diff options
author | 2009-10-15 15:21:20 -0700 | |
---|---|---|
committer | 2009-10-15 15:21:20 -0700 | |
commit | 8e7768d3f40d4ab79e6af58462e173cdbfad9cc6 (patch) | |
tree | 5f47b220e4232d6483fff490290f6491d34a2a74 /arch/x86/mm/fault.c | |
parent | Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip (diff) | |
parent | dlm: fix socket fd translation (diff) | |
download | linux-dev-8e7768d3f40d4ab79e6af58462e173cdbfad9cc6.tar.xz linux-dev-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 'arch/x86/mm/fault.c')
0 files changed, 0 insertions, 0 deletions