diff options
| author | David S. Miller <davem@davemloft.net> | 2014-10-10 15:07:02 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2014-10-10 15:07:02 -0400 |
| commit | 2403077d47991a8385789779ee5fc90b003f9fbe (patch) | |
| tree | 154c54eb25208fd61ccdc861d4f5a4c5823f46bb /drivers/net/macvlan.c | |
| parent | 38b3629adb8c048dda8b98e888505c79ed33ae92 (diff) | |
| parent | 41aace6e088d198f2441f3d0e579657d6815234c (diff) | |
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>
Diffstat (limited to 'drivers/net/macvlan.c')
0 files changed, 0 insertions, 0 deletions