Merge branches 'ipoib', 'mlx4' and 'nes' into for-linus