]> git.proxmox.com Git - mirror_ubuntu-eoan-kernel.git/commitdiff
Merge branch 'xgene'
authorDavid S. Miller <davem@davemloft.net>
Tue, 14 Oct 2014 20:09:38 +0000 (16:09 -0400)
committerDavid S. Miller <davem@davemloft.net>
Tue, 14 Oct 2014 20:09:38 +0000 (16:09 -0400)
Iyappan Subramanian says:

====================
Adding SGMII based 1GbE basic support to APM X-Gene SoC ethernet driver.

v2: Address comments from v1
* Split the patchset into two, the first one being preparatory patch
* Added link_state function pointer to the xgene_mac_ops structure
* Added xgene_indirect_ctl structure for indirect read/write arguments

v1:
* Initial version
====================

Signed-off-by: David S. Miller <davem@davemloft.net>

Trivial merge