Merge branches 'cxgb4', 'flowsteer', 'ipoib', 'iser', 'mlx4', 'ocrdma' and 'qib'...

diff --cc drivers/infiniband/core/uverbs.h
Simple merge

diff --cc drivers/infiniband/core/uverbs_cmd.c
Simple merge

diff --cc drivers/infiniband/core/verbs.c
Simple merge

diff --cc include/rdma/ib_verbs.h
Simple merge