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)
commita6aacbde406eeb6f8fc218b2c6172825f5e73fcf
treeb79e1a17c38090915085f0dbb501a0970cb79b28
parentb10778a00d40b3d9fdaaf5891e802794781ff71c
parent6fb5032ebb1c5b852461d64ee33829081de8ca61
Merge branch 'next' of git://git./linux/kernel/git/zohar/linux-integrity into next
Documentation/kernel-parameters.txt
include/linux/fs.h
init/main.c