]> www.infradead.org Git - users/hch/misc.git/commitdiff
projects / users / hch / misc.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 0eddb51 be3bd22)
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ryusuke...
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 13 Apr 2010 01:34:25 +0000 (18:34 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 13 Apr 2010 01:34:25 +0000 (18:34 -0700)
* '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()

1  2 
fs/nilfs2/alloc.c patch | diff1 | diff2 | blob | history
fs/nilfs2/ioctl.c patch | diff1 | diff2 | blob | history

diff --cc fs/nilfs2/alloc.c
Simple merge
diff --cc fs/nilfs2/ioctl.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.