Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/zohar/linux...

author James Morris <james.l.morris@oracle.com>

Wed, 19 Nov 2014 10:36:07 +0000 (21:36 +1100)

committer James Morris <james.l.morris@oracle.com>

Wed, 19 Nov 2014 10:36:07 +0000 (21:36 +1100)
author James Morris <james.l.morris@oracle.com>
Wed, 19 Nov 2014 10:36:07 +0000 (21:36 +1100)
committer James Morris <james.l.morris@oracle.com>
Wed, 19 Nov 2014 10:36:07 +0000 (21:36 +1100)
diff --cc Documentation/kernel-parameters.txt
Simple merge
diff --cc include/linux/fs.h
Simple merge
diff --cc init/main.c
Simple merge
author	James Morris <james.l.morris@oracle.com>
	Wed, 19 Nov 2014 10:36:07 +0000 (21:36 +1100)
committer	James Morris <james.l.morris@oracle.com>
	Wed, 19 Nov 2014 10:36:07 +0000 (21:36 +1100)
		1	2
Documentation/kernel-parameters.txt	patch \|	diff1 \|	diff2 \|	blob \| history
include/linux/fs.h	patch \|	diff1 \|	diff2 \|	blob \| history
init/main.c	patch \|	diff1 \|	diff2 \|	blob \| history