Merge branch 'mlx4'
authorDavid S. Miller <davem@davemloft.net>
Mon, 15 Dec 2014 16:35:00 +0000 (11:35 -0500)
committerDavid S. Miller <davem@davemloft.net>
Mon, 15 Dec 2014 16:35:00 +0000 (11:35 -0500)
Or Gerlitz says:

====================
mlx4 driver fixes for 3.19-rc1

Just fixes for two small issues introduced in the 3.19 merge window
====================

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

Trivial merge