diff options
| author |   Jakub Kicinski <kuba@kernel.org> | 2021-02-16 22:58:44 -0800 |
|---|---|---|
| committer | Jakub Kicinski <kuba@kernel.org> | 2021-02-16 23:12:23 -0800 |
| commit | b646acd5eb48ec49ef90404336d7e8ee502ecd05 (patch) | |
| tree | cf6859bd3c44bc865f3248810d66a165bd757f8f /Documentation/networking/sfp-phylink.rst | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net (diff) | |
| download | linux-dev-b646acd5eb48ec49ef90404336d7e8ee502ecd05.tar.xz linux-dev-b646acd5eb48ec49ef90404336d7e8ee502ecd05.zip | |
net: re-solve some conflicts after net -> net-next merge
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to 'Documentation/networking/sfp-phylink.rst')
0 files changed, 0 insertions, 0 deletions