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

Just some simple overlapping changes in marvell PHY driver
and the DSA core code.

Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
David S. Miller
2017-06-06 22:20:08 -04:00
436 changed files with 3765 additions and 2094 deletions

View File

@@ -266,7 +266,7 @@ static const struct phy_setting settings[] = {
* phy_lookup_setting - lookup a PHY setting
* @speed: speed to match
* @duplex: duplex to match
* @feature: allowed link modes
* @features: allowed link modes
* @exact: an exact match is required
*
* Search the settings array for a setting that matches the speed and