diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-03-17 00:04:02 (GMT) |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-03-17 00:04:02 (GMT) |
| commit | 33e9ee8dbd0c564533e9ac0e1a0c00e073d5b5c0 (patch) | |
| tree | 8cb0a64fc266fdf5b9f41d99b3c27427678e5e9f | |
| parent | 9fc005c017101c498f336329c6bdf510bce8ef6e (diff) | |
| parent | 95d16c7211a5166d6e0241ca8c507718bef3c745 (diff) | |
| download | linux-fsl-qoriq-33e9ee8dbd0c564533e9ac0e1a0c00e073d5b5c0.tar.xz | |
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
| -rw-r--r-- | MAINTAINERS | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 03e0b48..9c63a43 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 |