OSDN Git Service

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)
commit4d1bafbe485240ee19dcedad864c7c5bae07a7e1
tree411fe9bb6ccca8bc20a60c8c387ea409c223b9e2
parentc15952dc18d8a293d976ac6c06d44d9d98023b45
parent5e6a024bebea5bad6b787cf2c0ee28116b4147f0
Merge branch 'xgene'

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>