From: Linus Torvalds Date: Wed, 21 Apr 2010 19:30:07 +0000 (-0700) Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/shaggy... X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=9befb55ef51ad69dd67e279b0533d4cbc5e4c6c0;p=GitHub%2FLineageOS%2Fandroid_kernel_motorola_exynos9610.git Merge branch 'for-linus' of git://git./linux/kernel/git/shaggy/jfs-2.6 * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/shaggy/jfs-2.6: jfs: add jfs specific ->setattr call jfs: fix diAllocExt error in resizing filesystem jfs_dmap.[ch]: trivial typo fix: s/heigth/height/g --- 9befb55ef51ad69dd67e279b0533d4cbc5e4c6c0