Merge branch 'xgene'
authorDavid S. Miller <davem@davemloft.net>
Fri, 10 Oct 2014 19:07:02 +0000 (15:07 -0400)
committerDavid S. Miller <davem@davemloft.net>
Fri, 10 Oct 2014 19:07:02 +0000 (15:07 -0400)
commit2403077d47991a8385789779ee5fc90b003f9fbe
tree154c54eb25208fd61ccdc861d4f5a4c5823f46bb
parent38b3629adb8c048dda8b98e888505c79ed33ae92
parent41aace6e088d198f2441f3d0e579657d6815234c
Merge branch 'xgene'

Iyappan Subramanian says:

====================
Add 10GbE support to APM X-Gene SoC ethernet driver

Adding 10GbE support to APM X-Gene SoC ethernet driver.

v4: Address comments from v3
* dtb: resolved merge conflict for the net tree

v3: Address comments from v2
* dtb: changed to use all-zeros for the mac address

v2: Address comments from v1
* created preparatory patch to review before adding new functionality
* dtb: updated to use tabs consistently

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

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