From: Linus Torvalds Date: Fri, 12 Jun 2009 20:17:12 +0000 (-0700) Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/dlm X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=c53567ad4528b6efefc3fc22a354d20f6226a098;p=GitHub%2Fmt8127%2Fandroid_kernel_alcatel_ttab.git Merge branch 'for-linus' of git://git./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 --- c53567ad4528b6efefc3fc22a354d20f6226a098