Merge branch 'for-linus' into for-next

author Al Viro <viro@zeniv.linux.org.uk>

Sun, 12 Apr 2015 02:29:51 +0000 (22:29 -0400)

committer Al Viro <viro@zeniv.linux.org.uk>

Sun, 12 Apr 2015 02:29:51 +0000 (22:29 -0400)
author Al Viro <viro@zeniv.linux.org.uk>
Sun, 12 Apr 2015 02:29:51 +0000 (22:29 -0400)
committer Al Viro <viro@zeniv.linux.org.uk>
Sun, 12 Apr 2015 02:29:51 +0000 (22:29 -0400)
diff --cc fs/aio.c
Simple merge
diff --cc fs/ocfs2/file.c
Simple merge
diff --cc include/linux/fs.h
Simple merge
author	Al Viro <viro@zeniv.linux.org.uk>
	Sun, 12 Apr 2015 02:29:51 +0000 (22:29 -0400)
committer	Al Viro <viro@zeniv.linux.org.uk>
	Sun, 12 Apr 2015 02:29:51 +0000 (22:29 -0400)
		1	2
fs/aio.c	patch \|	diff1 \|	diff2 \|	blob \| history
fs/ocfs2/file.c	patch \|	diff1 \|	diff2 \|	blob \| history
include/linux/fs.h	patch \|	diff1 \|	diff2 \|	blob \| history