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 M: Anil S Keshavamurthy M: "David S. Miller" -M: Masami Hiramatsu +M: Masami Hiramatsu S: Maintained F: Documentation/kprobes.txt F: include/linux/kprobes.h