From: Linus Torvalds Date: Tue, 13 Apr 2010 01:34:25 +0000 (-0700) Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ryusuke... X-Git-Tag: firefly_0821_release~9833^2~2368 X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=44fa2b4bee5b07d506a7b002b4e2eb73654db7e0;p=firefly-linux-kernel-4.4.55.git Merge branch 'for-linus' of git://git./linux/kernel/git/ryusuke/nilfs2 * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ryusuke/nilfs2: nilfs2: fix typo "numer" -> "number" in alloc.c nilfs2: Remove an uninitialization warning in nilfs_btree_propagate_v() nilfs2: fix a wrong type conversion in nilfs_ioctl() --- 44fa2b4bee5b07d506a7b002b4e2eb73654db7e0