From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 14 Nov 2010 21:04:53 +0000 (-0800)
Subject: Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jlbec... 
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=1ca7318cacdac5262492149cf46abc06c95693fa;p=GitHub%2FLineageOS%2Fandroid_kernel_samsung_universal7580.git

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

* 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jlbec/ocfs2:
  ocfs2: Change some lock status member in ocfs2_lock_res to char.
---

1ca7318cacdac5262492149cf46abc06c95693fa