Merge tag 'perf-core-for-mingo-20160803' of git://git.kernel.org/pub/scm/linux/kernel...

[cascardo/linux.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index 13a782b..256f56b 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -2837,7 +2837,7 @@ F:        include/uapi/linux/can/error.h
 F:     include/uapi/linux/can/netlink.h
 
 CAPABILITIES
-M:     Serge Hallyn <serge.hallyn@canonical.com>
+M:     Serge Hallyn <serge@hallyn.com>
 L:     linux-security-module@vger.kernel.org
 S:     Supported
 F:     include/linux/capability.h
@@ -5334,8 +5334,9 @@ M:        Bjorn Andersson <bjorn.andersson@linaro.org>
 L:     linux-remoteproc@vger.kernel.org
 S:     Maintained
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/ohad/hwspinlock.git
+F:     Documentation/devicetree/bindings/hwlock/
 F:     Documentation/hwspinlock.txt
-F:     drivers/hwspinlock/hwspinlock_*
+F:     drivers/hwspinlock/
 F:     include/linux/hwspinlock.h
 
 HARMONY SOUND DRIVER
@@ -10674,7 +10675,7 @@ SMACK SECURITY MODULE
 M:     Casey Schaufler <casey@schaufler-ca.com>
 L:     linux-security-module@vger.kernel.org
 W:     http://schaufler-ca.com
-T:     git git://git.gitorious.org/smack-next/kernel.git
+T:     git git://github.com/cschaufler/smack-next
 S:     Maintained
 F:     Documentation/security/Smack.txt
 F:     security/smack/