Merge branch 'xgene-next'

Browse source

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>

...

This commit is contained in:

David S. Miller 2015-06-23 07:19:27 -07:00

parent 0dd0770936 c2d33bdc66

commit 0a51f76e3c

4 changed files with 69 additions and 40 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

7

drivers/net/ethernet/apm/xgene/xgene_enet_hw.c

View file

80

drivers/net/ethernet/apm/xgene/xgene_enet_main.c

View file

11

drivers/net/ethernet/apm/xgene/xgene_enet_sgmac.c

View file

11

drivers/net/ethernet/apm/xgene/xgene_enet_xgmac.c

View file