Merge branch 'mlxsw-small-updates'
authorDavid S. Miller <davem@davemloft.net>
Thu, 27 Aug 2015 23:31:17 +0000 (16:31 -0700)
committerDavid S. Miller <davem@davemloft.net>
Thu, 27 Aug 2015 23:31:17 +0000 (16:31 -0700)
commitc4d3e22438d405b84c00710aad177184d789353f
tree8a72938a16998ebec052aa739085526901d27088
parentec5d165555ea02ac9b69bbed8ff8f1de7c782f66
parent1e81779ae41e5d14174ce5e61790ace34914ade0
Merge branch 'mlxsw-small-updates'

Jiri Pirko says:

====================
mlxsw: small driver update

Ido Schimmel (2):
  mlxsw: Remove duplicate included header
  mlxsw: Make mailboxes 4KB aligned

Jiri Pirko (1):
  mlxsw: adjust transmit fail log message level in __mlxsw_emad_transmit
====================

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