diff options
author | James Morris <jmorris@namei.org> | 2011-06-30 18:44:55 +1000 |
---|---|---|
committer | James Morris <jmorris@namei.org> | 2011-06-30 18:44:55 +1000 |
commit | da3f1c7b7d34e66cf571a613525ca0d23f92d42f (patch) | |
tree | 0233826259cbe4cd44755ccc893b77a3e8ac5213 /security/tomoyo/tomoyo.c | |
parent | Merge branch 'linus' into next (diff) | |
parent | AppArmor: Fix masking of capabilities in complain mode (diff) | |
download | linux-dev-da3f1c7b7d34e66cf571a613525ca0d23f92d42f.tar.xz linux-dev-da3f1c7b7d34e66cf571a613525ca0d23f92d42f.zip |
Merge branch 'for-security' of git://git.kernel.org/pub/scm/linux/kernel/git/jj/apparmor-dev into next
Diffstat (limited to '')
0 files changed, 0 insertions, 0 deletions