summaryrefslogtreecommitdiffstats
path: root/MAINTAINERS
diff options
context:
space:
mode:
authorTyler Hicks <tyhicks@canonical.com>2011-11-05 09:04:47 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2011-11-05 17:58:26 -0700
commit0de9adf284ec20454ecf37ffd98e7e98ba7292d6 (patch)
treebd8f9bd03904c0be41da011522c737338786607e /MAINTAINERS
parent8110efc64c4790cd1bf7e30f080e5ba3faa7cb85 (diff)
MAINTAINERS: Update eCryptfs maintainer address
Update my email address in MAINTAINERS. Signed-off-by: Tyler Hicks <tyhicks@canonical.com> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'MAINTAINERS')
-rw-r--r--MAINTAINERS2
1 files changed, 1 insertions, 1 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index a6afe342f0f..6388a96dc1c 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -2387,7 +2387,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