X-Git-Url: https://git.karo-electronics.de/?a=blobdiff_plain;f=MAINTAINERS;h=4808256446f298437ea00cd5a229376806d868b9;hb=7b4b98fa0c4d3a975b36bfe9984e4cd117f2ddff;hp=237c9ab228042b733716b65ef9bf62ae038e834f;hpb=dd1294c4ed25725d13a6cb3d93ca0eb5fee14963;p=mv-sheeva.git

diff --git a/MAINTAINERS b/MAINTAINERS
index 237c9ab2280..4808256446f 100644
--- 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
@@ -4673,7 +4673,7 @@ L:	linux-omap@vger.kernel.org
 W:	http://www.muru.com/linux/omap/
 W:	http://linux.omap.com/
 Q:	http://patchwork.kernel.org/project/linux-omap/list/
-T:	git git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6.git
+T:	git git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap.git
 S:	Maintained
 F:	arch/arm/*omap*/