forked from luck/tmp_suning_uos_patched
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 |