From: Linus Torvalds Date: Tue, 24 May 2011 22:04:00 +0000 (-0700) Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/dlm X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=df3256f9ab7ae2127144de5ba2abca332278a42d;p=openwrt%2Fstaging%2Fblogic.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: make plock operation killable dlm: remove shared message stub for recovery dlm: delayed reply message warning dlm: Remove superfluous call to recalc_sigpending() --- df3256f9ab7ae2127144de5ba2abca332278a42d