Merge remote-tracking branch 'ocfs2/linux-next'

Conflicts:
	fs/ocfs2/xattr.c

diff --cc fs/ocfs2/dir.c
Simple merge

diff --cc fs/ocfs2/dlmglue.c
Simple merge

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

diff --cc fs/ocfs2/move_extents.c
Simple merge