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> |
||
---|---|---|
.. | ||
Kconfig | ||
Makefile | ||
cassini.c | ||
cassini.h | ||
ldmvsw.c | ||
niu.c | ||
niu.h | ||
sunbmac.c | ||
sunbmac.h | ||
sungem.c | ||
sungem.h | ||
sunhme.c | ||
sunhme.h | ||
sunqe.c | ||
sunqe.h | ||
sunvnet.c | ||
sunvnet_common.c | ||
sunvnet_common.h |