diff options
author | John Johansen <john.johansen@canonical.com> | 2010-07-29 17:48:09 -0400 |
---|---|---|
committer | James Morris <jmorris@namei.org> | 2010-08-02 01:35:15 -0400 |
commit | c1c124e91e7c6d5a600c98f6fb5b443c403a14f4 (patch) | |
tree | 58a4cf515dbd4fc4ea9e132fb2c5427d87408e3d /MAINTAINERS | |
parent | 898127c34ec03291c86f4ff3856d79e9e18952bc (diff) |
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 | |||
5061 | F: include/linux/selinux* | 5061 | F: include/linux/selinux* |
5062 | F: security/selinux/ | 5062 | F: security/selinux/ |
5063 | 5063 | ||
5064 | APPARMOR SECURITY MODULE | ||
5065 | M: John Johansen <john.johansen@canonical.com> | ||
5066 | L: apparmor@lists.ubuntu.com (subscribers-only, general discussion) | ||
5067 | W: apparmor.wiki.kernel.org | ||
5068 | T: git git://git.kernel.org/pub/scm/linux/kernel/git/jj/apparmor-dev.git | ||
5069 | S: Supported | ||
5070 | F: security/apparmor/ | ||
5071 | |||
5064 | SENSABLE PHANTOM | 5072 | SENSABLE PHANTOM |
5065 | M: Jiri Slaby <jirislaby@gmail.com> | 5073 | M: Jiri Slaby <jirislaby@gmail.com> |
5066 | S: Maintained | 5074 | S: Maintained |