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)
commit0a51f76e3c3efcd5eb740868e1096221f8d7d8e0
tree2831ea538e4b73fcae941506fb3a17de24df020a
parent0dd0770936363ecd4d49192782bceccb882d3a24
parentc2d33bdc66e3b7db574e6b4864225cb341bffbcd
Merge branch 'xgene-next'

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>