mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
synced 2024-12-28 16:53:49 +00:00
3cbd2090d3
Cross-merge networking fixes after downstream PR. Conflicts: drivers/net/ethernet/faraday/ftgmac100.c |
||
---|---|---|
.. | ||
i2c.c | ||
Kconfig | ||
Makefile | ||
pn533.c | ||
pn533.h | ||
uart.c | ||
usb.c |