Merge branch 'f2fs' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs into dev
authorJaegeuk Kim <jaegeuk.kim@samsung.com>
Mon, 11 Feb 2013 22:17:20 +0000 (07:17 +0900)
committerJaegeuk Kim <jaegeuk.kim@samsung.com>
Mon, 11 Feb 2013 22:17:20 +0000 (07:17 +0900)
commit90b2fc64f0a6d6a6706eae0a90038ed576d5d4b6
treecc76f9ae4611fee079e85fbff06596815cd1e363
parente9750824114ff939d9da299e73651add6aa65456
parentb7f7a5e0be94d13875a1c6c9aa65eeb11a46fc1b
Merge branch 'f2fs' of git://git./linux/kernel/git/viro/vfs into dev

Pull f2fs cleanup patches from Al Viro:

f2fs: get rid of fake on-stack dentries
f2fs: switch init_inode_metadata() to passing parent and name separately
f2fs: switch new_inode_page() from dentry to qstr
f2fs: init_dent_inode() should take qstr

Signed-off-by: Jaegeuk Kim <jaegeuk.kim@samsung.com>
Conflicts:
fs/f2fs/recovery.c
fs/f2fs/dir.c
fs/f2fs/f2fs.h
fs/f2fs/node.c
fs/f2fs/recovery.c