Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/zohar/linux...
authorJames Morris <james.l.morris@oracle.com>
Thu, 2 Oct 2014 09:47:23 +0000 (19:47 +1000)
committerJames Morris <james.l.morris@oracle.com>
Thu, 2 Oct 2014 09:47:23 +0000 (19:47 +1000)
1  2 
Documentation/kernel-parameters.txt

Simple merge