Merge branch 'k.o/for-4.12' into k.o/for-4.12-rdma-netdevice
authorDoug Ledford <dledford@redhat.com>
Thu, 20 Apr 2017 16:00:41 +0000 (12:00 -0400)
committerDoug Ledford <dledford@redhat.com>
Thu, 20 Apr 2017 16:00:41 +0000 (12:00 -0400)
1  2 
include/rdma/ib_verbs.h

Simple merge