diff options
author | David S. Miller <davem@davemloft.net> | 2015-01-28 06:08:13 +0100 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2015-01-28 06:08:13 +0100 |
commit | ff660f75be36e6db75d45dc742a4a468c5a9c20d (patch) | |
tree | 36c2647d695b08324f11336e29cb52fc98578b04 /net/openvswitch/vport-vxlan.c | |
parent | net: netcp: remove unused kconfig option and code (diff) | |
parent | stmmac: pci: add MSI support for Intel Quark X1000 (diff) | |
download | linux-ff660f75be36e6db75d45dc742a4a468c5a9c20d.tar.xz linux-ff660f75be36e6db75d45dc742a4a468c5a9c20d.zip |
Merge branch 'stmmac-pci'
Andy Shevchenko says:
====================
stmmac: Enable Intel Quark SoC X1000 Ethernet support
This is third version of the patch series [1] to bring network card support to
Intel Quark SoC.
The series has been tested on Intel Galileo board.
Changelog v3:
- rebase on top of recent net-next
- rework an approach to get the custom configuration
- rework an approach how to get unique bus_id
- improve DMI lookup function
[1] http://www.spinics.net/lists/netdev/msg296010.html
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/openvswitch/vport-vxlan.c')
0 files changed, 0 insertions, 0 deletions