From: David S. Miller <davem@davemloft.net>
Date: Mon, 8 Jun 2015 07:50:49 +0000 (-0700)
Subject: Merge branch 'phy-micrel'
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=6508060232ee78200a2258aefeeb148ce9ed1526;p=sagit-ice-cold%2Fkernel_xiaomi_msm8998.git

Merge branch 'phy-micrel'

Jaeden Amero says:

====================
net/phy: micrel: Center FLP timing at 16ms

In v2, we add an additional cleanup commit to make an array of strings
static const and to improve const correctness generally. We also no longer
unnecessarily initialize the result variable in
ksz9031_center_flp_timing().

In v3, we remove the unnecessary result variable from ksz9031_config_init()
introduced by a previous version of "net/phy: micrel: Center FLP timing at
16ms".

In v4, we modify the commit message of "net/phy: micrel: Center FLP timing
at 16ms" to replace the awkward quotation of the data sheet's programming
procedure with an explanation of why we program the FLP burst registers and
restart auto-negotiation where we do (config_init).
====================

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

6508060232ee78200a2258aefeeb148ce9ed1526