From: Linus Torvalds Date: Wed, 9 Jul 2008 04:48:26 +0000 (-0700) Subject: Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mfashe... X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=b72e9ebe7efa5754aa53bbdb0040a2d6eeb34db3;p=GitHub%2FLineageOS%2FG12%2Fandroid_kernel_amlogic_linux-4.9.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: [PATCH] ocfs2/dlm: Fixes oops in dlm_new_lockres() --- b72e9ebe7efa5754aa53bbdb0040a2d6eeb34db3