Merge branch 'calxedaxgmac'
authorDavid S. Miller <davem@davemloft.net>
Wed, 2 Oct 2013 20:10:45 +0000 (16:10 -0400)
committerDavid S. Miller <davem@davemloft.net>
Wed, 2 Oct 2013 20:10:45 +0000 (16:10 -0400)
Rob Herring says:

====================
This is a couple of fixes related to xgmac_set_rx_mode. The changes are
necessary for "bridge fdb add" to work correctly.
====================

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

Trivial merge