| commit | 79c9cc3cd08cf784fce252378290d9f171d00947 | [log] [tgz] |
|---|---|---|
| author | David S. Miller <davem@davemloft.net> | Thu Apr 30 16:03:14 2015 -0400 |
| committer | David S. Miller <davem@davemloft.net> | Thu Apr 30 16:03:14 2015 -0400 |
| tree | 26afe87e28efb362f72faa2b7ae5b6be224f4891 | |
| parent | f828ad0ce22474820255c6faeb88b05724a8c1eb [diff] | |
| parent | 561fea6deacf72b2d42a777c07bcb930ebdebb3c [diff] |
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>