Merge branch 'mlxsw-fixes'
authorDavid S. Miller <davem@davemloft.net>
Thu, 9 Jun 2016 18:20:05 +0000 (11:20 -0700)
committerDavid S. Miller <davem@davemloft.net>
Thu, 9 Jun 2016 18:20:05 +0000 (11:20 -0700)
Jiri Pirko says:

====================
mlxsw: couple of fixes

Couple of fixes from Ido.
====================

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

Trivial merge