Merge branch 'mlx4-net'
authorDavid S. Miller <davem@davemloft.net>
Wed, 18 Mar 2015 19:17:17 +0000 (15:17 -0400)
committerDavid S. Miller <davem@davemloft.net>
Wed, 18 Mar 2015 19:17:17 +0000 (15:17 -0400)
commit2fc800f2c5f701f6198ec39ef3686b2e757809ec
tree1c279e27459b8ec3844b47514a6fa7e69e279869
parentced585c83b27deca427c606a34dd3eaa6b96d82b
parent39de961a4a3317741a7ac0cb9607593f9ffec779
Merge branch 'mlx4-net'

Or Gerlitz says:

====================
mlx4 driver fixes for 4.0-rc

Just few small fixes for the 4.0 rc cycle.

The fix from Moni addresses an issue from 4.0-rc1 so we
just need it for net.

Eran's fix for off-by-one should go to 3.19.y too.
====================

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