Doug Ledford 882f3b3b91 Merge branches '4.5/Or-cleanup' and '4.5/rdma-cq' into k.o/for-4.5 ... Signed-off-by: Doug Ledford <dledford@redhat.com> Conflicts: drivers/infiniband/ulp/iser/iser_verbs.c		2015-12-22 17:03:15 -05:00
..
core	Merge branches '4.5/Or-cleanup' and '4.5/rdma-cq' into k.o/for-4.5	2015-12-22 17:03:15 -05:00
hw	IB/mlx5: Postpone remove_keys under knowledge of coming preemption	2015-12-08 16:55:31 -05:00
ulp	Merge branches '4.5/Or-cleanup' and '4.5/rdma-cq' into k.o/for-4.5	2015-12-22 17:03:15 -05:00
Kconfig	IB: add a proper completion queue abstraction	2015-12-11 14:10:43 -08:00
Makefile	IB: Allow build of hw/ and ulp/ subdirectories independently	2014-06-02 14:51:12 -07:00