mirror of
https://git.proxmox.com/git/mirror_ubuntu-kernels.git
synced 2025-12-21 07:21:58 +00:00
Minor conflict in drivers/s390/net/qeth_l2_main.c, kept the lock from commit |
||
|---|---|---|
| .. | ||
| emac | ||
| rmnet | ||
| Kconfig | ||
| Makefile | ||
| qca_7k_common.c | ||
| qca_7k_common.h | ||
| qca_7k.c | ||
| qca_7k.h | ||
| qca_debug.c | ||
| qca_debug.h | ||
| qca_spi.c | ||
| qca_spi.h | ||
| qca_uart.c | ||