| commit | 2e9095234daa5ac3aa5f53f66b00c92d32271343 | [log] [tgz] |
|---|---|---|
| author | David S. Miller <davem@davemloft.net> | Thu Apr 09 17:35:37 2015 -0400 |
| committer | David S. Miller <davem@davemloft.net> | Thu Apr 09 17:35:37 2015 -0400 |
| tree | 151a992115b3e39a98463e81af367312cbfbf78b | |
| parent | 1e53d5bb8878dcbdbffde334ab89b1f57778b48c [diff] | |
| parent | a8373f1a60d0716e25f5c4cd4d6e3909bfdb41bd [diff] |
Merge branch 'xgbe-next' Tom Lendacky says: ==================== amd-xgbe: AMD XGBE driver updates 2015-04-09 The following series of patches includes functional updates and changes to the driver. - Allow ethtool rx-frames coalescing to be changed while the device is up - Consolidate initialization routine into the init function - Add support for the TX watchdog timeout This patch series is based on net-next. ==================== Signed-off-by: David S. Miller <davem@davemloft.net>