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

..

ib_srp.c

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

ib_srp.h

Merge branch 'rdma-cq.2' of git://git.infradead.org/users/hch/rdma into 4.5/rdma-cq

2015-12-15 14:10:44 -05:00

Kbuild

…

Kconfig

…