| commit | cff497c8701ba5133e3407fd41430dc6159a3541 | [log] [tgz] |
|---|---|---|
| author | David S. Miller <davem@davemloft.net> | Mon May 25 00:13:58 2015 -0400 |
| committer | David S. Miller <davem@davemloft.net> | Mon May 25 00:13:58 2015 -0400 |
| tree | 6f4ce7a1aabf943f77ee42e031ab83e9f39186de | |
| parent | cf826244322443215c156c0751fa2c982969a9c9 [diff] | |
| parent | d5c78399b0e1e2a457375a0d7d2ac61bd41e9be4 [diff] |
Merge branch 'amd-xgbe-next' Tom Lendacky says: ==================== amd-xgbe: AMD XGBE driver updates 2015-05-22 The following patches are included in this driver update series: - Retrieve and set an additional hardware feature setting - Fix the initial mode/speed determination when auto-negotiation is disabled - Add additional netif_dbg support to the driver This patch series is based on net-next. ==================== Signed-off-by: David S. Miller <davem@davemloft.net>