Cross-merge networking fixes after downstream PR. Conflicts: drivers/net/ethernet/faraday/ftgmac100.c |
||
|---|---|---|
| .. | ||
| Kconfig | ||
| Makefile | ||
| i2c.c | ||
| pn533.c | ||
| pn533.h | ||
| uart.c | ||
| usb.c | ||
Cross-merge networking fixes after downstream PR. Conflicts: drivers/net/ethernet/faraday/ftgmac100.c |
||
|---|---|---|
| .. | ||
| Kconfig | ||
| Makefile | ||
| i2c.c | ||
| pn533.c | ||
| pn533.h | ||
| uart.c | ||
| usb.c | ||