4d8773b68e
Minor conflict in mlx5 because changes happened to code that has moved meanwhile. Signed-off-by: David S. Miller <davem@davemloft.net> |
||
---|---|---|
.. | ||
Makefile | ||
qlcnic.h | ||
qlcnic_83xx_hw.c | ||
qlcnic_83xx_hw.h | ||
qlcnic_83xx_init.c | ||
qlcnic_83xx_vnic.c | ||
qlcnic_ctx.c | ||
qlcnic_dcb.c | ||
qlcnic_dcb.h | ||
qlcnic_ethtool.c | ||
qlcnic_hdr.h | ||
qlcnic_hw.c | ||
qlcnic_hw.h | ||
qlcnic_init.c | ||
qlcnic_io.c | ||
qlcnic_main.c | ||
qlcnic_minidump.c | ||
qlcnic_sriov.h | ||
qlcnic_sriov_common.c | ||
qlcnic_sriov_pf.c | ||
qlcnic_sysfs.c |