summaryrefslogtreecommitdiffstats
path: root/MAINTAINERS
diff options
context:
space:
mode:
authorSerge E. Hallyn <serge@hallyn.com>2016-05-27 21:23:39 +0200
committerJames Morris <james.l.morris@oracle.com>2016-06-06 11:52:24 +0200
commit39baa7e6add5062bebf7cf1bdf6ecb4f380386bc (patch)
treee4949fcd126c57199783094f78faa40d15192ca4 /MAINTAINERS
parentLinux 4.7-rc2 (diff)
downloadlinux-39baa7e6add5062bebf7cf1bdf6ecb4f380386bc.tar.xz
linux-39baa7e6add5062bebf7cf1bdf6ecb4f380386bc.zip
MAINTAINERS: update Serge Hallyn's email address
Author: Serge Hallyn <serge.hallyn@ubuntu.com> Date: Thu May 19 23:37:05 2016 -0500 Update email address My canonical.com email address will soon stop working. Signed-off-by: Serge Hallyn <serge@hallyn.com> Signed-off-by: James Morris <james.l.morris@oracle.com>
Diffstat (limited to 'MAINTAINERS')
-rw-r--r--MAINTAINERS2
1 files changed, 1 insertions, 1 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index ed42cb65a19b..7227c791004f 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -2813,7 +2813,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