summaryrefslogtreecommitdiffstats
path: root/MAINTAINERS
diff options
context:
space:
mode:
authorDoug Ledford <dledford@redhat.com>2017-09-25 11:18:35 -0400
committerDoug Ledford <dledford@redhat.com>2017-09-25 11:18:35 -0400
commit7ae6f2a3d552dc01c4423c0cdede1daa9fd07991 (patch)
treed4c76d35c940cd59b80115120bdc62c2ba6f79be /MAINTAINERS
parent0d9c2ff1c9f7f8b339fc42ac9763b28c71f1c115 (diff)
parentbd491d2ad3c071fb77f487a471aa66f205e2e7f2 (diff)
downloadblackbird-op-linux-7ae6f2a3d552dc01c4423c0cdede1daa9fd07991.tar.gz
blackbird-op-linux-7ae6f2a3d552dc01c4423c0cdede1daa9fd07991.zip
Merge branch 'qedr' into k.o/for-next
Signed-off-by: Doug Ledford <dledford@redhat.com>
Diffstat (limited to 'MAINTAINERS')
-rw-r--r--MAINTAINERS1
1 files changed, 1 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index 6671f375f7fc..473c9b17a37c 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -11068,6 +11068,7 @@ F: drivers/net/ethernet/qlogic/qede/
QLOGIC QL4xxx RDMA DRIVER
M: Ram Amrani <Ram.Amrani@cavium.com>
+M: Michal Kalderon <Michal.Kalderon@cavium.com>
M: Ariel Elior <Ariel.Elior@cavium.com>
L: linux-rdma@vger.kernel.org
S: Supported
OpenPOWER on IntegriCloud