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)
commit58d7553d5593292e1bdbfd6423b44caaca0799bd
treeace64d0ccf89db5b59b596892ba5337aebcff3ec
parent1b13c97fae9c61dc20db8e0d0a72a29df29ac377
parent3484aac16149636f0ba5b5b0789a2918c682db7e
Merge branch 'mlx4'

Merge mlx4 bug fixes from Amir Vadai.

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