Merge branch 'stmmac-pci'
authorDavid S. Miller <davem@davemloft.net>
Wed, 28 Jan 2015 05:08:13 +0000 (21:08 -0800)
committerDavid S. Miller <davem@davemloft.net>
Wed, 28 Jan 2015 05:08:13 +0000 (21:08 -0800)
commitff660f75be36e6db75d45dc742a4a468c5a9c20d
tree36c2647d695b08324f11336e29cb52fc98578b04
parent488327c6ef2a2f39adc6d9f017745921c8b747e5
parentd2a029bde37b4c2e2d8b26e7457bb2c58afbbadd
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>