Merge branches 'rxe' and 'mlx' into k.o/for-next
authorDoug Ledford <dledford@redhat.com>
Thu, 27 Jul 2017 00:13:33 +0000 (20:13 -0400)
committerDoug Ledford <dledford@redhat.com>
Thu, 27 Jul 2017 00:13:33 +0000 (20:13 -0400)
1  2  3 
include/rdma/ib_verbs.h

Simple merge