Merge branch 'mlxsw-fixes'
authorDavid S. Miller <davem@davemloft.net>
Sun, 11 Oct 2015 12:08:14 +0000 (05:08 -0700)
committerDavid S. Miller <davem@davemloft.net>
Sun, 11 Oct 2015 12:08:14 +0000 (05:08 -0700)
Jiri Pirko says:

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

Just a couple of small fixes.
====================

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

Trivial merge