InfiniBand/RDMA fixes for 3.5-rc:
 - Fixes to new ocrdma driver
 - Typo in test in CMA
Merge branches 'cma' and 'ocrdma' into for-linus