commit | 44fa2b4bee5b07d506a7b002b4e2eb73654db7e0 | [log] [tgz] |
---|---|---|
author | Linus Torvalds <torvalds@linux-foundation.org> | Mon Apr 12 18:34:25 2010 -0700 |
committer | Linus Torvalds <torvalds@linux-foundation.org> | Mon Apr 12 18:34:25 2010 -0700 |
tree | 5415a4988e326de7d3456d72115ac74f548ca8d1 | |
parent | 0eddb519b9127c73d53db4bf3ec1d45b13f844d1 [diff] | |
parent | be3bd2223b89d270853302ab0a5909fa875fd831 [diff] |
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()