Merge branch 'for-linus' into work.lookups

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

Mon, 2 May 2016 23:49:46 +0000 (19:49 -0400)

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

Mon, 2 May 2016 23:49:46 +0000 (19:49 -0400)
author Al Viro <viro@zeniv.linux.org.uk>
Mon, 2 May 2016 23:49:46 +0000 (19:49 -0400)
committer Al Viro <viro@zeniv.linux.org.uk>
Mon, 2 May 2016 23:49:46 +0000 (19:49 -0400)
diff --cc fs/namei.c
Simple merge
diff --cc fs/splice.c
Simple merge
author	Al Viro <viro@zeniv.linux.org.uk>
	Mon, 2 May 2016 23:49:46 +0000 (19:49 -0400)
committer	Al Viro <viro@zeniv.linux.org.uk>
	Mon, 2 May 2016 23:49:46 +0000 (19:49 -0400)
		1	2
fs/namei.c	patch \|	diff1 \|	diff2 \|	blob \| history
fs/splice.c	patch \|	diff1 \|	diff2 \|	blob \| history