| commit | 34aa83c2fc23e055968387c8b78ac8bafd735aff | [log] [tgz] |
|---|---|---|
| author | David S. Miller <davem@davemloft.net> | Fri May 26 20:46:35 2017 -0400 |
| committer | David S. Miller <davem@davemloft.net> | Fri May 26 20:46:35 2017 -0400 |
| tree | a53a341d74613e512bf467ea12615f509cb53536 | |
| parent | 47936d35edbac5e58064bd15e51136050b2f2717 [diff] | |
| parent | e2a9aa5ab2a4d1fb05fcdfa9661d54e437093297 [diff] |
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>