From: Linus Torvalds Date: Mon, 23 May 2011 05:43:01 +0000 (-0700) Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ryusuke... X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=caebc160ce3f76761cc62ad96ef6d6f30f54e3dd;p=sagit-ice-cold%2Fkernel_xiaomi_msm8998.git Merge branch 'for-linus' of git://git./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() --- caebc160ce3f76761cc62ad96ef6d6f30f54e3dd