Merge branch 'mlx4'
authorDavid S. Miller <davem@davemloft.net>
Thu, 31 Jan 2013 17:49:10 +0000 (12:49 -0500)
committerDavid S. Miller <davem@davemloft.net>
Thu, 31 Jan 2013 17:49:10 +0000 (12:49 -0500)
Merge mlx4 bug fixes from Amir Vadai.

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

Trivial merge