From: Linus Torvalds <torvalds@linux-foundation.org>
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-Tag: firefly_0821_release~9833^2~3099
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=4cbd55188fe01f22783815cbb6d4f55a0ebf5969;p=firefly-linux-kernel-4.4.55.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