From: Linus Torvalds Date: Thu, 11 Dec 2014 00:02:12 +0000 (-0800) Subject: Merge tag 'dlm-3.19' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=8322b6fddfd2cee41a7732284e5f04750511f4b2;p=GitHub%2FLineageOS%2FG12%2Fandroid_kernel_amlogic_linux-4.9.git Merge tag 'dlm-3.19' of git://git./linux/kernel/git/teigland/linux-dlm Pull dlm update from David Teigland: "This set includes one feature, which allows locks that have been orphaned to be reacquired" * tag 'dlm-3.19' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm: dlm: adopt orphan locks --- 8322b6fddfd2cee41a7732284e5f04750511f4b2