From: Linus Torvalds Date: Sat, 27 Feb 2010 01:19:30 +0000 (-0800) 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=4cbd55188fe01f22783815cbb6d4f55a0ebf5969;p=GitHub%2FLineageOS%2Fandroid_kernel_samsung_universal7580.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 bastmode in debugfs output dlm: Send lockspace name with uevents dlm: send reply before bast dlm: fix ordering of bast and cast --- 4cbd55188fe01f22783815cbb6d4f55a0ebf5969