diff options
author | David S. Miller <davem@davemloft.net> | 2019-05-08 02:22:09 +0200 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2019-05-08 02:22:09 +0200 |
commit | a9e41a529681b38087c91ebc0bb91e12f510ca2d (patch) | |
tree | 544bf5861113e2f7e676a333a1267d887c800870 /usr | |
parent | net: phy: improve pause mode reporting in phy_print_status (diff) | |
parent | cxgb4: Fix error path in cxgb4_init_module (diff) | |
download | linux-a9e41a529681b38087c91ebc0bb91e12f510ca2d.tar.xz linux-a9e41a529681b38087c91ebc0bb91e12f510ca2d.zip |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Minor conflict with the DSA legacy code removal.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'usr')
0 files changed, 0 insertions, 0 deletions