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
This commit is contained in:
Doug Ledford 2015-12-22 17:03:15 -05:00
commit 882f3b3b91
33 changed files with 1057 additions and 1111 deletions