Merge branch 'amd-xgbe'
authorDavid S. Miller <davem@davemloft.net>
Tue, 5 Aug 2014 23:47:07 +0000 (16:47 -0700)
committerDavid S. Miller <davem@davemloft.net>
Tue, 5 Aug 2014 23:47:07 +0000 (16:47 -0700)
commit0ca58d6242999b36c3fa53cb3dd3775fbc5a7594
tree19519ab7ec4444ccdd97e05b22a126ee6f511985
parentc2a198569aeab71c36156f83128916dce9561741
parent88131a812b16b45cf999e577ad8d89b41ad606e3
Merge branch 'amd-xgbe'

Tom Lendacky says:

====================
amd-xgbe: AMD XGBE driver update 2014-08-05

The following series of patches includes fixes/updates to the driver.

- Use dma_set_mask_and_coherent to set the DMA mask
- Move the phy connect/disconnect logic to allow for module unloading

Changes in V2:
- Check the return value of the dma_set_mask_and_coherent call
====================

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