Merge branch 'mlxsw-fixes'
authorDavid S. Miller <davem@davemloft.net>
Fri, 9 Sep 2016 23:56:54 +0000 (16:56 -0700)
committerDavid S. Miller <davem@davemloft.net>
Fri, 9 Sep 2016 23:56:54 +0000 (16:56 -0700)
Jiri Pirko says:

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

Couple of fixes from Ido and myself.
====================

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

Trivial merge