From: David S. Miller Date: Tue, 14 Oct 2014 20:09:38 +0000 (-0400) Subject: Merge branch 'xgene' X-Git-Tag: v3.18-rc1~32^2~38 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=4d1bafbe485240ee19dcedad864c7c5bae07a7e1;p=karo-tx-linux.git 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 --- 4d1bafbe485240ee19dcedad864c7c5bae07a7e1