Merge branch 'mlx5-net'
authorDavid S. Miller <davem@davemloft.net>
Thu, 6 Nov 2014 21:40:47 +0000 (16:40 -0500)
committerDavid S. Miller <davem@davemloft.net>
Thu, 6 Nov 2014 21:40:47 +0000 (16:40 -0500)
Eli Cohen says:

====================
mlx5_core fixes for 3.18

the following two patches fix races to could lead to kernel panic in some cases.
====================

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

Trivial merge