mirror of
https://git.proxmox.com/git/mirror_ubuntu-kernels.git
synced 2025-11-29 23:07:38 +00:00
Conflicts: drivers/net/usb/qmi_wwan.c include/net/dst.h Trivial merge conflicts, both were overlapping changes. Signed-off-by: David S. Miller <davem@davemloft.net> |
||
|---|---|---|
| .. | ||
| netxen | ||
| qlcnic | ||
| qlge | ||
| Kconfig | ||
| Makefile | ||
| qla3xxx.c | ||
| qla3xxx.h | ||