Cross-merge networking fixes after downstream PR. Conflicts: drivers/net/ethernet/broadcom/bnxt/bnxt.c |
||
|---|---|---|
| .. | ||
| 8139cp.c | ||
| 8139too.c | ||
| Kconfig | ||
| Makefile | ||
| atp.c | ||
| atp.h | ||
| r8169.h | ||
| r8169_firmware.c | ||
| r8169_firmware.h | ||
| r8169_leds.c | ||
| r8169_main.c | ||
| r8169_phy_config.c | ||
Cross-merge networking fixes after downstream PR. Conflicts: drivers/net/ethernet/broadcom/bnxt/bnxt.c |
||
|---|---|---|
| .. | ||
| 8139cp.c | ||
| 8139too.c | ||
| Kconfig | ||
| Makefile | ||
| atp.c | ||
| atp.h | ||
| r8169.h | ||
| r8169_firmware.c | ||
| r8169_firmware.h | ||
| r8169_leds.c | ||
| r8169_main.c | ||
| r8169_phy_config.c | ||