From bc6905fd111d1dc1a7f46bf796b160d2c5bdf868 Mon Sep 17 00:00:00 2001
From: Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>
Date: Tue, 29 Jun 2010 15:05:32 -0700
Subject: [PATCH] --- yaml --- r: 200646 b: refs/heads/master c:
 97c29e747394b4b1d6d5bf14a9d5051073b23d5b h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 466f80ea1704..f735a98e589e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8d1f66dc9b4f80a1441bc1c33efa98aca99e8813
+refs/heads/master: 97c29e747394b4b1d6d5bf14a9d5051073b23d5b
diff --git a/trunk/MAINTAINERS b/trunk/MAINTAINERS
index ff5a63cb77e4..ab06c64953da 100644
--- a/trunk/MAINTAINERS
+++ b/trunk/MAINTAINERS
@@ -3382,7 +3382,7 @@ KPROBES
 M:	Ananth N Mavinakayanahalli <ananth@in.ibm.com>
 M:	Anil S Keshavamurthy <anil.s.keshavamurthy@intel.com>
 M:	"David S. Miller" <davem@davemloft.net>
-M:	Masami Hiramatsu <mhiramat@redhat.com>
+M:	Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>
 S:	Maintained
 F:	Documentation/kprobes.txt
 F:	include/linux/kprobes.h