Merge remote-tracking branch 'ext4/dev'

diff --cc fs/ext4/file.c
Simple merge

diff --cc fs/ext4/inode.c
Simple merge

diff --cc fs/ext4/namei.c
Simple merge

diff --cc include/linux/ext3_fs.h
Simple merge

diff --cc include/linux/fs.h
Simple merge