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

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