From: David S. Miller Date: Fri, 10 Oct 2014 19:07:02 +0000 (-0400) Subject: Merge branch 'xgene' X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=2403077d47991a8385789779ee5fc90b003f9fbe;p=GitHub%2FLineageOS%2FG12%2Fandroid_kernel_amlogic_linux-4.9.git Merge branch 'xgene' Iyappan Subramanian says: ==================== Add 10GbE support to APM X-Gene SoC ethernet driver Adding 10GbE support to APM X-Gene SoC ethernet driver. v4: Address comments from v3 * dtb: resolved merge conflict for the net tree v3: Address comments from v2 * dtb: changed to use all-zeros for the mac address v2: Address comments from v1 * created preparatory patch to review before adding new functionality * dtb: updated to use tabs consistently v1: * Initial version ==================== Signed-off-by: David S. Miller --- 2403077d47991a8385789779ee5fc90b003f9fbe