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 c021f29779a7..1469ff0d3f4d 100644
--- a/.mailmap
+++ b/.mailmap
@@ -73,6 +73,8 @@ James E Wilson <[email protected]>
James Ketrenos <jketreno@io.(none)>
Jean Tourrilhes <[email protected]>
diff --git a/MAINTAINERS b/MAINTAINERS
index b5b00ebb04c5..540762a62906 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -6841,6 +6841,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/