From a3b25d48dbb01d39c9f39eeb97e17e847f945abc Mon Sep 17 00:00:00 2001
From: Tyler Hicks <tyhicks@canonical.com>
Date: Sat, 5 Nov 2011 09:04:47 -0400
Subject: [PATCH] --- yaml --- r: 273985 b: refs/heads/master c:
 0de9adf284ec20454ecf37ffd98e7e98ba7292d6 h: refs/heads/master i:   273983:
 9b745c56d7f22e199b8398751508ccbd09a1a569 v: v3

---
 [refs]            | 2 +-
 trunk/MAINTAINERS | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index c3686c1a3a9b..f7d4ace5bb2d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8110efc64c4790cd1bf7e30f080e5ba3faa7cb85
+refs/heads/master: 0de9adf284ec20454ecf37ffd98e7e98ba7292d6
diff --git a/trunk/MAINTAINERS b/trunk/MAINTAINERS
index a6afe342f0fc..6388a96dc1c4 100644
--- a/trunk/MAINTAINERS
+++ b/trunk/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