Merge remote-tracking branch 'infiniband/for-next'

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

diff --cc drivers/net/ethernet/mellanox/mlx4/main.c
Simple merge

diff --cc drivers/net/ethernet/mellanox/mlx4/mlx4.h
Simple merge

diff --cc drivers/net/ethernet/mellanox/mlx4/resource_tracker.c
Simple merge

diff --cc include/linux/mlx4/device.h
Simple merge