aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.mailmap2
-rw-r--r--MAINTAINERS1
2 files changed, 3 insertions, 0 deletions
diff --git a/.mailmap b/.mailmap
index c7b10caecc4e..cd1090fd2cc5 100644
--- a/.mailmap
+++ b/.mailmap
@@ -71,6 +71,8 @@ James E Wilson <[email protected]>
James Ketrenos <jketreno@io.(none)>
Jean Tourrilhes <[email protected]>
diff --git a/MAINTAINERS b/MAINTAINERS
index f1688510178a..402f01e69b93 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -6775,6 +6775,7 @@ F: drivers/ipack/
INFINIBAND SUBSYSTEM
M: Doug Ledford <[email protected]>
+M: Jason Gunthorpe <[email protected]>
W: http://www.openfabrics.org/
Q: http://patchwork.kernel.org/project/linux-rdma/list/