From: David S. Miller Date: Fri, 27 Mar 2015 21:18:52 +0000 (-0700) Subject: Merge branch 'xgene-next' X-Git-Tag: v4.1-rc1~128^2~136 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=19cc2dec8ab0fd258b023be1835aa8d710232877;p=thirdparty%2Fkernel%2Flinux.git Merge branch 'xgene-next' Iyappan Subramanian says: ==================== drivers: net: xgene: Add separate tx completion ring SGMII based 1GbE and 10GbE interfaces support multiple interrupts. Adding separate tx completion descriptor ring and associating a dedicated irq for the TX completion. ==================== Signed-off-by: Iyappan Subramanian Signed-off-by: Keyur Chudgar --- 19cc2dec8ab0fd258b023be1835aa8d710232877