tree 7e959ca06059589a7529072a14b095bf72ea3af4
parent bfde3398e57c9defdbb552aaede680300e8a448a
parent 6964e97051146c2dcac99065e0c0367cf76c829a
author David S. Miller <davem@davemloft.net> 1405467060 -0700
committer David S. Miller <davem@davemloft.net> 1405467060 -0700

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 <davem@davemloft.net>