Merge tag 'v3.4-rc5' into next

[sfrench/cifs-2.6.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index bb76fc42fc42ee4d7b2d9f218d71422cfcfca357..d7ca204a0f8ecc0a2b0e275860977f0284dd3d2d 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1731,6 +1731,7 @@ S:        Supported
 F:     include/linux/capability.h
 F:     security/capability.c
 F:     security/commoncap.c 
+F:     kernel/capability.c
 
 CELL BROADBAND ENGINE ARCHITECTURE
 M:     Arnd Bergmann <arnd@arndb.de>
@@ -5961,7 +5962,7 @@ SECURITY SUBSYSTEM
 M:     James Morris <james.l.morris@oracle.com>
 L:     linux-security-module@vger.kernel.org (suggested Cc:)
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security.git
-W:     http://security.wiki.kernel.org/
+W:     http://kernsec.org/
 S:     Supported
 F:     security/