diff options
| author | David S. Miller <davem@davemloft.net> | 2017-01-30 16:50:57 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-01-30 16:50:57 -0500 |
| commit | 63c190429020a9701b42887ac22c28f287f1762f (patch) | |
| tree | 759b1a285330156e34863d910c4a0c7a4a0b3b89 /net/ipv6/xfrm6_state.c | |
| parent | cdaf25dfc058ee6f7a7b2e2353de00fa288c0cd4 (diff) | |
| parent | 1558727a1c1b65459cb9ae31f36ace45d56c6767 (diff) | |
Merge branch 'ESPRESSObin-ethernet'
Gregory CLEMENT says:
====================
dsa: Add support for the ethernet switch on the ESPRESSObin
This set of patches adds support for the Marvell Ethernet Topaz switch
family (88E6141/88E6341) which is found on the ESPRESSObin. With this
series the network is usable on this board.
As usual, I rebased the series on the very last net-next/master. In
this series there is no temperature support which need some patches
form Andrew Lunn.
As soon as Andrew Lunn will post the needed patch I will send a patch
to enable the temperature support.
Changelog:
v6 -> v7:
- rebased on net-next/master (5b8784aaf29b)
- Fixed the wrong age time coeff from 15s to 3.75s.
- Remove support for temperature sensor
v5 -> v6:
- rebased on net-next/master (d140199af510)
- Fix the redundant check on mv88e6xxx_6341_family (reported by Julia
Lawall)
- Add support for the 88E6141
- Move support for temperature sensor in the phy part
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv6/xfrm6_state.c')
0 files changed, 0 insertions, 0 deletions