From: Joel Becker <joel.becker@oracle.com>
Date: Fri, 30 Apr 2010 20:37:29 +0000 (-0700)
Subject: Merge branch 'skip_delete_inode' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=f9221fd80343285514568da6c5dbda0f87109de8;p=GitHub%2FLineageOS%2FG12%2Fandroid_kernel_amlogic_linux-4.9.git

Merge branch 'skip_delete_inode' of git://git./linux/kernel/git/mfasheh/ocfs2-mark into ocfs2-fixes
---

f9221fd80343285514568da6c5dbda0f87109de8