From: David S. Miller <davem@davemloft.net>
Date: Thu, 30 Apr 2015 20:03:14 +0000 (-0400)
Subject: Merge branch 'xgene-next'
X-Git-Tag: v4.2-rc1~130^2~401
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=79c9cc3cd08cf784fce252378290d9f171d00947;p=karo-tx-linux.git

Merge branch 'xgene-next'

Iyappan Subramanian says:

====================
drivers: net: xgene: Add ethernet with ring manager v2 support

Adding XFI based 10GbE and SGMII based 1GbE with ring manager v2 support
for APM X-Gene ethernet driver.  The ring manager v2 is used by 2nd
generation SoC.

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

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

79c9cc3cd08cf784fce252378290d9f171d00947