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

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>