Merge branch 'qedr' into k.o/for-next
authorDoug Ledford <dledford@redhat.com>
Mon, 25 Sep 2017 15:18:35 +0000 (11:18 -0400)
committerDoug Ledford <dledford@redhat.com>
Mon, 25 Sep 2017 15:18:35 +0000 (11:18 -0400)
commit7ae6f2a3d552dc01c4423c0cdede1daa9fd07991
treed4c76d35c940cd59b80115120bdc62c2ba6f79be
parent0d9c2ff1c9f7f8b339fc42ac9763b28c71f1c115
parentbd491d2ad3c071fb77f487a471aa66f205e2e7f2
Merge branch 'qedr' into k.o/for-next

Signed-off-by: Doug Ledford <dledford@redhat.com>
MAINTAINERS
drivers/infiniband/hw/qedr/main.c
drivers/infiniband/hw/qedr/qedr.h
drivers/infiniband/hw/qedr/verbs.c