mirror of
https://github.com/edk2-porting/linux-next.git
synced 2024-12-26 14:14:01 +08:00
c3fa32b976
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 |