Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Skip to content
Commit 882f3b3b authored by Doug Ledford's avatar Doug Ledford
Browse files

Merge branches '4.5/Or-cleanup' and '4.5/rdma-cq' into k.o/for-4.5 



Signed-off-by: default avatarDoug Ledford <dledford@redhat.com>

Conflicts:
	drivers/infiniband/ulp/iser/iser_verbs.c
parents 182a2da0 c6333f9f
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment