Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/zohar/linux...
authorJames Morris <james.l.morris@oracle.com>
Wed, 19 Nov 2014 10:36:07 +0000 (21:36 +1100)
committerJames Morris <james.l.morris@oracle.com>
Wed, 19 Nov 2014 10:36:07 +0000 (21:36 +1100)
1  2 
Documentation/kernel-parameters.txt
include/linux/fs.h
init/main.c

Simple merge
Simple merge
diff --cc init/main.c
Simple merge