summaryrefslogtreecommitdiff
path: root/security/apparmor
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2015-04-08 21:04:25 +0100
committerMark Brown <broonie@kernel.org>2015-04-08 21:04:25 +0100
commit89cda06d7f9c3c111a81fcdf5464926f5f984ebc (patch)
treebfa46c20c325feccd9de1a293e11686981d63e7b /security/apparmor
parentede8342bf63166e8d8fc3c05fc0985b27cc8186b (diff)
parentf22e6e847115abc3a0e2ad7bb18d243d42275af1 (diff)
Merge tag 'v4.0-rc7' into spi-img-spfi
Linux 4.0-rc7
Diffstat (limited to 'security/apparmor')
0 files changed, 0 insertions, 0 deletions