From: David S. Miller <davem@davemloft.net>
Date: Sat, 27 May 2017 00:46:35 +0000 (-0400)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
X-Git-Tag: v4.13-rc1~157^2~355
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=34aa83c2fc23e055968387c8b78ac8bafd735aff;p=thirdparty%2Fkernel%2Flinux.git

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

Overlapping changes in drivers/net/phy/marvell.c, bug fix in 'net'
restricting a HW workaround alongside cleanups in 'net-next'.

Signed-off-by: David S. Miller <davem@davemloft.net>
---

34aa83c2fc23e055968387c8b78ac8bafd735aff