diff options
author | David S. Miller <davem@davemloft.net> | 2015-04-30 22:03:14 +0200 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2015-04-30 22:03:14 +0200 |
commit | 79c9cc3cd08cf784fce252378290d9f171d00947 (patch) | |
tree | 26afe87e28efb362f72faa2b7ae5b6be224f4891 /drivers/net/ethernet/ibm/ibmveth.h | |
parent | tcp_westwood: fix tcp_westwood_info() (diff) | |
parent | drivers: net: xgene: Add SGMII based 1GbE support with ring manager v2 (diff) | |
download | linux-79c9cc3cd08cf784fce252378290d9f171d00947.tar.xz linux-79c9cc3cd08cf784fce252378290d9f171d00947.zip |
Merge branch 'xgene-next'
Iyappan Subramanian says:
====================
drivers: net: xgene: Add ethernet with ring manager v2 support
Adding XFI based 10GbE and SGMII based 1GbE with ring manager v2 support
for APM X-Gene ethernet driver. The ring manager v2 is used by 2nd
generation SoC.
v1:
* Initial version
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/ibm/ibmveth.h')
0 files changed, 0 insertions, 0 deletions