diff options
author | John Johansen <john.johansen@canonical.com> | 2010-07-29 14:48:09 -0700 |
---|---|---|
committer | James Morris <jmorris@namei.org> | 2010-08-02 15:35:15 +1000 |
commit | c1c124e91e7c6d5a600c98f6fb5b443c403a14f4 (patch) | |
tree | 58a4cf515dbd4fc4ea9e132fb2c5427d87408e3d /MAINTAINERS | |
parent | 898127c34ec03291c86f4ff3856d79e9e18952bc (diff) | |
download | linux-c1c124e91e7c6d5a600c98f6fb5b443c403a14f4.tar.gz linux-c1c124e91e7c6d5a600c98f6fb5b443c403a14f4.tar.bz2 linux-c1c124e91e7c6d5a600c98f6fb5b443c403a14f4.zip |
AppArmor: update Maintainer and Documentation
Signed-off-by: John Johansen <john.johansen@canonical.com>
Signed-off-by: James Morris <jmorris@namei.org>
Diffstat (limited to 'MAINTAINERS')
-rw-r--r-- | MAINTAINERS | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 284431856461..33606bb91f1f 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -5061,6 +5061,14 @@ S: Supported F: include/linux/selinux* F: security/selinux/ +APPARMOR SECURITY MODULE +M: John Johansen <john.johansen@canonical.com> +L: apparmor@lists.ubuntu.com (subscribers-only, general discussion) +W: apparmor.wiki.kernel.org +T: git git://git.kernel.org/pub/scm/linux/kernel/git/jj/apparmor-dev.git +S: Supported +F: security/apparmor/ + SENSABLE PHANTOM M: Jiri Slaby <jirislaby@gmail.com> S: Maintained |