Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

[~shefty/rdma-dev.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index 237c9ab228042b733716b65ef9bf62ae038e834f..4c5eac0e51d1b30a85642af141118245178def7d 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -2388,7 +2388,7 @@ F:        include/linux/netfilter_bridge/ebt_*.h
 F:     net/bridge/netfilter/ebt*.c
 
 ECRYPT FILE SYSTEM
-M:     Tyler Hicks <tyhicks@linux.vnet.ibm.com>
+M:     Tyler Hicks <tyhicks@canonical.com>
 M:     Dustin Kirkland <kirkland@canonical.com>
 L:     ecryptfs@vger.kernel.org
 W:     https://launchpad.net/ecryptfs