aboutsummaryrefslogtreecommitdiff
path: root/MAINTAINERS
diff options
context:
space:
mode:
authorMasami Hiramatsu <masami.hiramatsu.pt@hitachi.com>2010-06-29 15:05:32 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2010-06-29 15:29:31 -0700
commit97c29e747394b4b1d6d5bf14a9d5051073b23d5b (patch)
tree4016997033fd076783d6ad395fcefa7d86c8ac4a /MAINTAINERS
parent8d1f66dc9b4f80a1441bc1c33efa98aca99e8813 (diff)
MAINTAINERS: Masami Hiramatsu has moved
Masami Hiramatsu moved back to Hitachi Japan and changed his email address. Signed-off-by: Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com> Cc: Ananth N Mavinakayanahalli <ananth@in.ibm.com> Cc: Anil S Keshavamurthy <anil.s.keshavamurthy@intel.com> Cc: "David S. Miller" <davem@davemloft.net> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'MAINTAINERS')
-rw-r--r--MAINTAINERS2
1 files changed, 1 insertions, 1 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index ff5a63cb77e..ab06c64953d 100644
--- a/MAINTAINERS
+++ b/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