Merge branch 'mlx4'
authorDavid S. Miller <davem@davemloft.net>
Tue, 5 May 2015 23:39:13 +0000 (19:39 -0400)
committerDavid S. Miller <davem@davemloft.net>
Tue, 5 May 2015 23:39:13 +0000 (19:39 -0400)
Or Gerlitz says:

====================
mlx4 fixes for 4.1-rc2

Eran's fix is for a small off-by-one introduces on 4.1-rc1.

Yisahi fixes an issue with comes into play only on VMs with
many (> 256) vCPUs.
====================

Signed-off-by: David S. Miller <davem@davemloft.net>

Trivial merge