Doug Ledford d0d62c34fb Merge branch 'rdma-netlink' into k.o/merge-test ... Conflicts: include/rdma/ib_verbs.h - Modified a function signature adjacent to a newly added function signature from a previous merge Signed-off-by: Doug Ledford <dledford@redhat.com>		2017-08-10 14:34:18 -04:00
..
ipoib	Merge branch 'rdma-netlink' into k.o/merge-test	2017-08-10 14:34:18 -04:00
iser	RDMA: Remove useless MODULE_VERSION	2017-07-24 08:45:11 -04:00
isert	RDMA: Remove useless MODULE_VERSION	2017-07-24 08:45:11 -04:00
opa_vnic	Merge branch 'misc' into k.o/for-next	2017-07-27 09:00:38 -04:00
srp	RDMA: Remove useless MODULE_VERSION	2017-07-24 08:45:11 -04:00
srpt	IB/srpt: Increase lid and sm_lid to 32 bits	2017-08-08 14:47:18 -04:00
Makefile	IB/opa-vnic: Virtual Network Interface Controller (VNIC) netdev	2017-04-20 12:01:38 -04:00