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)
commitc5e44b69854294df7234a4f898b2d05adee1a0d5
treed585c494c1abfbc156da51e5872930542128667a
parent67e2c3883828b39548cee2091b36656787775d95
parentc78e25edbf3ed87b23709c9b0732be5fa00d5f9f
Merge branch 'mlx4'

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>