Merge branch 'mlxsw-fixes'
authorDavid S. Miller <davem@davemloft.net>
Wed, 17 Feb 2016 20:52:59 +0000 (15:52 -0500)
committerDavid S. Miller <davem@davemloft.net>
Wed, 17 Feb 2016 20:52:59 +0000 (15:52 -0500)
Jiri Pirko says:

====================
mlxsw fixes

Just a couple of fixes from Ido.
====================

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

Trivial merge