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
..
core	Merge branch 'rdma-netlink' into k.o/merge-test	2017-08-10 14:34:18 -04:00
hw	Merge branch 'rdma-netlink' into k.o/merge-test	2017-08-10 14:34:18 -04:00
sw	Merge branches '32bit_lid' and 'irq_affinity' into k.o/merge-test	2017-08-10 14:31:29 -04:00
ulp	Merge branch 'rdma-netlink' into k.o/merge-test	2017-08-10 14:34:18 -04:00
Kconfig	IB/opa-vnic: Virtual Network Interface Controller (VNIC) netdev	2017-04-20 12:01:38 -04:00
Makefile	IB/rdmavt: Create module framework and handle driver registration	2016-03-10 20:37:04 -05:00