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
..
Kconfig	ib_srpt: Initial SRP Target merge for v3.3-rc1	2011-12-16 06:33:56 +00:00
Makefile	ib_srpt: Initial SRP Target merge for v3.3-rc1	2011-12-16 06:33:56 +00:00
ib_dm_mad.h	ib_srpt: Initial SRP Target merge for v3.3-rc1	2011-12-16 06:33:56 +00:00
ib_srpt.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_srpt.h	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