forked from Minki/linux
29fda25a2d
Two minor conflicts in virtio_net driver (bug fix overlapping addition of a helper) and MAINTAINERS (new driver edit overlapping revamp of PHY entry). Signed-off-by: David S. Miller <davem@davemloft.net> |
||
---|---|---|
.. | ||
bnxt_re.h | ||
ib_verbs.c | ||
ib_verbs.h | ||
Kconfig | ||
main.c | ||
Makefile | ||
qplib_fp.c | ||
qplib_fp.h | ||
qplib_rcfw.c | ||
qplib_rcfw.h | ||
qplib_res.c | ||
qplib_res.h | ||
qplib_sp.c | ||
qplib_sp.h | ||
roce_hsi.h |