From: Linus Torvalds Date: Sat, 23 Oct 2010 00:33:16 +0000 (-0700) Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/dlm X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=2c15bd00a5d6b2b64e006e91e2196f0c6a764cb6;p=mv-sheeva.git 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 dlm lock status block comment in dlm.h dlm: Don't send callback to node making lock request when "try 1cb" fails --- 2c15bd00a5d6b2b64e006e91e2196f0c6a764cb6