diff options
| author | David S. Miller <davem@davemloft.net> | 2014-09-29 14:36:33 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2014-09-29 14:36:33 -0400 |
| commit | 2b7fc477b0423cbcc7be8ad8652e3552198de418 (patch) | |
| tree | 58f6e51300fb344252e171ce4b167498e6be81e3 /net/ipv4 | |
| parent | 41c91996d99394a75912aa5bfda300b85789ed43 (diff) | |
| parent | 5b85bad2a473a8b90cac93d21ab024ba221a8b09 (diff) | |
| download | linux-2b7fc477b0423cbcc7be8ad8652e3552198de418.tar.gz linux-2b7fc477b0423cbcc7be8ad8652e3552198de418.tar.bz2 linux-2b7fc477b0423cbcc7be8ad8652e3552198de418.zip | |
Merge branch 'arcnet-EAE'
Michael Grzeschik says:
====================
ARCNET: add support for EAE multi interfac card
this series adds support for the PLX Bridge based multi interface
pci cards and adds support to change device address on com200xx chips
during runtime.
This series is based on v3.17-rc7.
It is fixed for build against com20020_cs.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4')
0 files changed, 0 insertions, 0 deletions