tree 6bedd4a62d65a4ba121a0c170d1ca657d922d352
parent d798f7f080805ad7e15fc37a43d8c6f91edb6dda
parent 5fc7b14177b1a1c2f2511aed62a4ca870d0332e7
author Linus Torvalds <torvalds@linux-foundation.org> 1306129381 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1306129381 -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: use mark_buffer_dirty to mark btnode or meta data dirty
  nilfs2: always set back pointer to host inode in mapping->host
  nilfs2: get rid of NILFS_I_NILFS
  nilfs2: use list_first_entry
  nilfs2: use empty_aops for gc-inodes
  nilfs2: implement resize ioctl
  nilfs2: add truncation routine of segment usage file
  nilfs2: add routine to move secondary super block
  nilfs2: add ioctl which limits range of segment to be allocated
  nilfs2: zero fill unused portion of super root block
  nilfs2: super root size should change depending on inode size
  nilfs2: get rid of private page allocator
  nilfs2: merge list_del()/list_add_tail() to list_move_tail()