]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
projects / linux.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f828ad0 561fea6)
Merge branch 'xgene-next'
authorDavid S. Miller <davem@davemloft.net>
Thu, 30 Apr 2015 20:03:14 +0000 (16:03 -0400)
committerDavid S. Miller <davem@davemloft.net>
Thu, 30 Apr 2015 20:03:14 +0000 (16:03 -0400)
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>

Trivial merge
local clone of linux.git