mirror of
https://github.com/edk2-porting/linux-next.git
synced 2024-12-28 23:23:55 +08:00
0ddead90b2
The conflicts were two cases of overlapping changes in batman-adv and the qed driver. Signed-off-by: David S. Miller <davem@davemloft.net> |
||
---|---|---|
.. | ||
cxgb3i | ||
cxgb4i | ||
Kconfig | ||
libcxgbi.c | ||
libcxgbi.h | ||
Makefile |