From: Linus Torvalds Date: Wed, 15 Jul 2009 01:37:24 +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=8aa651e23e2835b6d64381ce17447c995040ab30;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: free socket in error exit path dlm: fix plock use-after-free dlm: Fix uninitialised variable warning in lock.c --- 8aa651e23e2835b6d64381ce17447c995040ab30