summary refs log tree commit diff
path: root/MAINTAINERS
diff options
context:
space:
mode:
authorJames Morris <james.l.morris@oracle.com>2012-03-16 12:05:48 +1100
committerJames Morris <james.l.morris@oracle.com>2012-03-16 12:05:48 +1100
commit95d16c7211a5166d6e0241ca8c507718bef3c745 (patch)
treed491fe43cbf54d207ee21c32d2de59d2ec05ef7c /MAINTAINERS
parent0c4d0670f6e54f8507c30c01928cc9ff630ca497 (diff)
downloadlinux-95d16c7211a5166d6e0241ca8c507718bef3c745.tar.gz
MAINTAINERS: Add Serge as maintainer of capabilities
Add Serge as maintainer of capabilities, per suggestion on LWN:
http://lwn.net/Articles/486306/

Signed-off-by: James Morris <james.l.morris@oracle.com>
Diffstat (limited to 'MAINTAINERS')
-rw-r--r--MAINTAINERS8
1 files changed, 8 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index 03e0b4896bc6..9c63a43ab63a 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1721,6 +1721,14 @@ F:	include/linux/can/error.h
 F:	include/linux/can/netlink.h
 F:	include/linux/can/platform/
 
+CAPABILITIES
+M:	Serge Hallyn <serge.hallyn@canonical.com>
+L:	linux-security-module@vger.kernel.org
+S:	Supported	
+F:	include/linux/capability.h
+F:	security/capability.c
+F:	security/commoncap.c 
+
 CELL BROADBAND ENGINE ARCHITECTURE
 M:	Arnd Bergmann <arnd@arndb.de>
 L:	linuxppc-dev@lists.ozlabs.org