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

..

ipoib

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

iser

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

isert

IB/ulps: Avoid calling ib_query_device

2015-12-22 14:39:00 -05:00

srp

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

srpt

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

Makefile

IB: Allow build of hw/ and ulp/ subdirectories independently

2014-06-02 14:51:12 -07:00