From: Linus Torvalds Date: Tue, 24 Dec 2013 01:24:38 +0000 (-0800) Subject: Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=dc0a6b4fee04f99a3db3dd5affcce440dc0c4b7e;p=GitHub%2FLineageOS%2FG12%2Fandroid_kernel_amlogic_linux-4.9.git Merge branch 'for_linus' of git://git./linux/kernel/git/jack/linux-fs Pull ext2 fix from Jan Kara: "One simple fix of oops in ext2 which was recently hit by Christoph" * 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs: ext2: Fix oops in ext2_get_block() called from ext2_quota_write() --- dc0a6b4fee04f99a3db3dd5affcce440dc0c4b7e