From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 21 May 2010 14:28:02 +0000 (-0700)
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~2078
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=e90e4d9234c953b29267cc4fc9ad804128773313;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: fix ast ordering for user locks
  dlm: cleanup remove unused code
---

e90e4d9234c953b29267cc4fc9ad804128773313