From: David S. Miller Date: Tue, 15 Jul 2014 23:31:00 +0000 (-0700) Subject: Merge branch 'amd-xgbe-next' X-Git-Tag: firefly_0821_release~176^2~3474^2~163 X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=d5c1c93681699a2c354a8999b3c77e419bdadb64;p=firefly-linux-kernel-4.4.55.git Merge branch 'amd-xgbe-next' Tom Lendacky says: ==================== amd-xgbe: Remove baseT workaround for fixed speeds The following series expands the speed/duplex settings array in phy.c to support additional media types. With this expansion the workaround in the amd-xgbe driver to set/remove baseT media types based on whether auto negotiation is enabled can be removed. This patch series is based on net-next. ==================== Signed-off-by: David S. Miller --- d5c1c93681699a2c354a8999b3c77e419bdadb64