Merge remote-tracking branch 'ext4/dev'

diff --cc fs/ext4/ext4.h
Simple merge

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

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

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

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

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