summaryrefslogtreecommitdiff
path: root/MAINTAINERS
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2012-03-16 17:04:02 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2012-03-16 17:04:02 -0700
commit33e9ee8dbd0c564533e9ac0e1a0c00e073d5b5c0 (patch)
tree8cb0a64fc266fdf5b9f41d99b3c27427678e5e9f /MAINTAINERS
parent9fc005c017101c498f336329c6bdf510bce8ef6e (diff)
parent95d16c7211a5166d6e0241ca8c507718bef3c745 (diff)
downloadlinux-sh-33e9ee8dbd0c564533e9ac0e1a0c00e073d5b5c0.tar.gz
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security
Pull maintainer update from James Morris: "Please pull this patch which adds Serge as maintainer of the capabilities code, as discussed on lwn and the lsm list. New capabilities must be signed off by the maintainer, and new uses of any capabilities should at be cc'd to the maintainer." * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security: MAINTAINERS: Add Serge as maintainer of capabilities
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