From: Linus Torvalds <torvalds@woody.linux-foundation.org>
Date: Thu, 7 Feb 2008 20:46:35 +0000 (-0800)
Subject: Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mfashe... 
X-Git-Tag: firefly_0821_release~22785
X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=e5a9e8e6890d9b9c7a0f25b03ffdaf28614a9a4c;p=firefly-linux-kernel-4.4.55.git

Merge branch 'upstream-linus' of git://git./linux/kernel/git/mfasheh/ocfs2

* 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mfasheh/ocfs2:
  ocfs2: Negotiate locking protocol versions.
---

e5a9e8e6890d9b9c7a0f25b03ffdaf28614a9a4c