]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commit63c4425454fb8e55e4fb624a07081ce96e8fa0fa
tree154c54eb25208fd61ccdc861d4f5a4c5823f46bb
parente948d771b530f5a47ae29eff88a4d8c1342d99b8
parent0abfd548d5fe360e8ad80e098fdcf5e395975582
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>