From: David S. Miller Date: Wed, 2 Oct 2013 20:10:45 +0000 (-0400) Subject: Merge branch 'calxedaxgmac' X-Git-Tag: v3.12-rc7~20^2~81 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=52f77ba9256bc9dc0f7e6b37b03d00553e903d15;p=thirdparty%2Fkernel%2Flinux.git 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 --- 52f77ba9256bc9dc0f7e6b37b03d00553e903d15