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 +M: Tyler Hicks M: Dustin Kirkland L: ecryptfs@vger.kernel.org W: https://launchpad.net/ecryptfs