]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commit
projects / mirror_ubuntu-kernels.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(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)
commit79c9cc3cd08cf784fce252378290d9f171d00947
tree26afe87e28efb362f72faa2b7ae5b6be224f4891tree
parentf828ad0ce22474820255c6faeb88b05724a8c1ebcommit | diff
parent561fea6deacf72b2d42a777c07bcb930ebdebb3ccommit | 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>
Ubuntu combined Linux kernel mirror