X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=MAINTAINERS;h=f593300e310b80f4ca41c37dd9fc038003f42a08;hb=e87e0de4b547310081fa1999b9405f81d8875e9d;hp=01bff8ea28d88bf8a667100fa37dd376e049634e;hpb=b22734a55067adbc10216e459762dbd7dcef29d5;p=deliverable%2Flinux.git

diff --git a/MAINTAINERS b/MAINTAINERS
index 01bff8ea28d8..f593300e310b 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -8745,7 +8745,7 @@ F:	drivers/oprofile/
 F:	include/linux/oprofile.h
 
 ORACLE CLUSTER FILESYSTEM 2 (OCFS2)
-M:	Mark Fasheh <mfasheh@suse.com>
+M:	Mark Fasheh <mfasheh@versity.com>
 M:	Joel Becker <jlbec@evilplan.org>
 L:	ocfs2-devel@oss.oracle.com (moderated for non-subscribers)
 W:	http://ocfs2.wiki.kernel.org
@@ -11626,7 +11626,7 @@ F:	Documentation/devicetree/bindings/thermal/
 THERMAL/CPU_COOLING
 M:	Amit Daniel Kachhap <amit.kachhap@gmail.com>
 M:	Viresh Kumar <viresh.kumar@linaro.org>
-M:	Javi Merino <javi.merino@arm.com>
+M:	Javi Merino <javi.merino@kernel.org>
 L:	linux-pm@vger.kernel.org
 S:	Supported
 F:	Documentation/thermal/cpu-cooling-api.txt