diff options
| author |   David S. Miller <davem@davemloft.net> | 2014-07-30 18:47:51 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2014-07-30 18:47:51 -0700 |
| commit | 6b1bed793d69ca162eac7a2a2f4f629fc4d0d325 (patch) | |
| tree | e6bcfb2af38d8f8a7eabbbaaef6e5f004bd67dd6 /drivers/isdn/capi | |
| parent | net: Remove unlikely() for WARN_ON() conditions (diff) | |
| parent | amd-xgbe: Add traffic class support (diff) | |
| download | linux-dev-6b1bed793d69ca162eac7a2a2f4f629fc4d0d325.tar.xz linux-dev-6b1bed793d69ca162eac7a2a2f4f629fc4d0d325.zip | |
Merge branch 'amd-xgbe-next'
Tom Lendacky says:
====================
amd-xgbe: AMD XGBE driver update 2014-07-25
This patch series is dependent on the following patch that was
applied to the net tree and needs to be applied to the net-next
tree:
332cfc823d18 - amd-xgbe: Fix error return code in xgbe_probe()
The following series of patches includes fixes and new support in the
driver.
- Device bindings documentation update
- Hardware timestamp support
- 2.5GbE support changes
- Fifo sizes based on active queues/rings
- Phylib driver updates for:
- Rate change completion check
- KR training initiation
- Auto-negotiation results
- Traffic class support, including DCB support
This patch series is based on net-next.
Changes in V2:
- Remove DBGPR(...., __func__) calls
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/isdn/capi')
0 files changed, 0 insertions, 0 deletions