]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'amd-xgbe-next'
authorDavid S. Miller <davem@davemloft.net>
Tue, 15 Jul 2014 23:31:00 +0000 (16:31 -0700)
committerDavid S. Miller <davem@davemloft.net>
Tue, 15 Jul 2014 23:31:00 +0000 (16:31 -0700)
commitb47f9da8b205a99b78a05cbe172c91edee5f5ca3
tree7e959ca06059589a7529072a14b095bf72ea3af4
parented74d7130d6e672089ac1e9ee05f81da419f5b2a
parentae186fbc20e7f1d10b4cacf851e56d19af00c017
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>