Merge branch 'nsfs' into for-next

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

Thu, 11 Dec 2014 02:31:59 +0000 (21:31 -0500)

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

Thu, 11 Dec 2014 02:31:59 +0000 (21:31 -0500)
author Al Viro <viro@zeniv.linux.org.uk>
Thu, 11 Dec 2014 02:31:59 +0000 (21:31 -0500)
committer Al Viro <viro@zeniv.linux.org.uk>
Thu, 11 Dec 2014 02:31:59 +0000 (21:31 -0500)
diff --cc fs/Makefile
Simple merge
diff --cc init/main.c
Simple merge
author	Al Viro <viro@zeniv.linux.org.uk>
	Thu, 11 Dec 2014 02:31:59 +0000 (21:31 -0500)
committer	Al Viro <viro@zeniv.linux.org.uk>
	Thu, 11 Dec 2014 02:31:59 +0000 (21:31 -0500)
		1	2
fs/Makefile	patch \|	diff1 \|	diff2 \|	blob \| history
init/main.c	patch \|	diff1 \|	diff2 \|	blob \| history