Conflicts:
	include/rdma/ib_verbs.h - Modified a function signature adjacent
	to a newly added function signature from a previous merge
Signed-off-by: Doug Ledford <dledford@redhat.com>