David S. Miller 70f3522614 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Three conflicts, one of which, for marvell10g.c is non-trivial and
requires some follow-up from Heiner or someone else.

The issue is that Heiner converted the marvell10g driver over to
use the generic c45 code as much as possible.

However, in 'net' a bug fix appeared which makes sure that a new
local mask (MDIO_AN_10GBT_CTRL_ADV_NBT_MASK) with value 0x01e0
is cleared.

Signed-off-by: David S. Miller <davem@davemloft.net>
2019-02-24 12:06:19 -08:00
..
2018-06-18 22:40:32 +02:00
2018-06-12 16:19:22 -07:00
2019-02-22 13:46:55 +01:00
2017-02-10 14:31:51 -05:00
2018-06-18 22:40:32 +02:00
2018-09-05 10:15:48 +02:00
2018-02-22 21:13:03 +01:00
2014-04-09 14:49:43 +02:00
2019-02-22 13:46:25 +01:00
2019-02-08 13:56:37 +01:00
2012-03-13 14:54:16 -04:00
2018-02-22 21:13:03 +01:00