tree b5ff28c25204a40d8080e8adb28093c6926b5102
parent 698fd6a2c3ca05ec796072defb5c415289a86cdc
parent f6c26ec5085be805c9dc72d074ef5f504b9cd7df
author Linus Torvalds <torvalds@linux-foundation.org> 1290809640 +0900
committer Linus Torvalds <torvalds@linux-foundation.org> 1290809640 +0900

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 in comment of nilfs_dat_move function
  nilfs2: nilfs_iget_for_gc() returns ERR_PTR