commit | c53567ad4528b6efefc3fc22a354d20f6226a098 | [log] [tgz] |
---|---|---|
author | Linus Torvalds <torvalds@linux-foundation.org> | Fri Jun 12 13:17:12 2009 -0700 |
committer | Linus Torvalds <torvalds@linux-foundation.org> | Fri Jun 12 13:17:12 2009 -0700 |
tree | faa289a41715e0a9a174623a76c7d52b10d4a6df | |
parent | 4ddbac98980fe0a42cf57af5d1032e024aced6a1 [diff] | |
parent | 748285ccf7ea76d3d76d0d5f2945ad6fb91f5329 [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: use more NOFS allocation dlm: connect to nodes earlier dlm: fix use count with multiple joins dlm: Make name input parameter of {,dlm_}new_lockspace() const