Merge branch 'mlxsw-fixes'
authorDavid S. Miller <davem@davemloft.net>
Sun, 13 Nov 2016 17:51:01 +0000 (12:51 -0500)
committerDavid S. Miller <davem@davemloft.net>
Sun, 13 Nov 2016 17:51:01 +0000 (12:51 -0500)
Jiri Pirko says:

====================
mlxsw: Couple of fixes

Please, queue-up both for stable. Thanks!
====================

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

Trivial merge