127c73d53db4bf3ec1d45b13f844d1 parent be3bd2223b89d270853302ab0a5909fa875fd831 author Linus Torvalds 1271122465 -0700 committer Linus Torvalds 1271122465 -0700 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/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() “ÒÖ˜