Merge branch 'xgene-next'
authorDavid S. Miller <davem@davemloft.net>
Tue, 23 Jun 2015 14:19:27 +0000 (07:19 -0700)
committerDavid S. Miller <davem@davemloft.net>
Tue, 23 Jun 2015 14:19:27 +0000 (07:19 -0700)
Suman Tripathi says:

====================
drivers: net: xgene: Fix the ACPI support for RGMII/SGMII0/XFI ethernet interfaces of APM X-Gene SoC.
====================

Signed-off-by: Iyappan Subramanian <isubramanian@apm.com>
Signed-off-by: Suman Tripathi <stripathi@apm.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

Trivial merge