Merge branch 'for-4.2-misc' into k.o/for-4.2

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

diff --cc drivers/infiniband/hw/mlx4/main.c
Simple merge

diff --cc drivers/infiniband/ulp/ipoib/ipoib_main.c
Simple merge

diff --cc net/rds/ib_send.c
Simple merge

diff --cc net/rds/rds.h
Simple merge